From 136f6e097800742ec232c968b2bdd03bfab687f4 Mon Sep 17 00:00:00 2001 From: Apollon Oikonomopoulos Date: Wed, 26 Sep 2012 10:54:42 +0200 Subject: enable DNS resolution in imrelp --- ChangeLog | 2 ++ plugins/imrelp/imrelp.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 42752fec..6904ce48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 5.10.1 [V5-STABLE], 2012-0?-?? +- enable DNS resolution in imrelp + Thanks to Apollon Oikonomopoulos for the patch - bugfix: invalid property name in property-filter could cause abort if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c index 602809ff..b02f5bf5 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -44,6 +44,7 @@ #include "msg.h" #include "unicode-helper.h" #include "prop.h" +#include "glbl.h" MODULE_TYPE_INPUT MODULE_TYPE_NOKEEP @@ -52,6 +53,7 @@ MODULE_TYPE_NOKEEP DEF_IMOD_STATIC_DATA DEFobjCurrIf(net) DEFobjCurrIf(prop) +DEFobjCurrIf(glbl) /* Module static data */ static relpEngine_t *pRelpEngine; /* our relp engine */ @@ -104,6 +106,9 @@ static rsRetVal addListener(void __attribute__((unused)) *pVal, uchar *pNewVal) CHKiRet(relpEngineSetDbgprint(pRelpEngine, dbgprintf)); CHKiRet(relpEngineSetEnableCmd(pRelpEngine, (uchar*) "syslog", eRelpCmdState_Required)); CHKiRet(relpEngineSetSyslogRcv(pRelpEngine, onSyslogRcv)); + if (!glbl.GetDisableDNS()) { + CHKiRet(relpEngineSetDnsLookupMode(pRelpEngine, 1)); + } } CHKiRet(relpEngineAddListner(pRelpEngine, pNewVal)); @@ -162,6 +167,7 @@ CODESTARTmodExit iRet = relpEngineDestruct(&pRelpEngine); /* release objects we used */ + objRelease(glbl, CORE_COMPONENT); objRelease(prop, CORE_COMPONENT); objRelease(net, LM_NET_FILENAME); ENDmodExit @@ -187,6 +193,7 @@ CODESTARTmodInit CODEmodInit_QueryRegCFSLineHdlr pRelpEngine = NULL; /* request objects we use */ + CHKiRet(objUse(glbl, CORE_COMPONENT)); CHKiRet(objUse(prop, CORE_COMPONENT)); CHKiRet(objUse(net, LM_NET_FILENAME)); -- cgit