diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imrelp/imrelp.c | 7 | ||||
| -rw-r--r-- | runtime/im-helper.h | 1 |
3 files changed, 9 insertions, 1 deletions
@@ -682,6 +682,8 @@ expected that interfaces, even new ones, break during the initial [ported from v4] --------------------------------------------------------------------------- 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 f6040b21..a3209fbe 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -46,6 +46,7 @@ #include "unicode-helper.h" #include "prop.h" #include "ruleset.h" +#include "glbl.h" MODULE_TYPE_INPUT MODULE_TYPE_NOKEEP @@ -57,6 +58,7 @@ DEFobjCurrIf(net) DEFobjCurrIf(prop) DEFobjCurrIf(errmsg) DEFobjCurrIf(ruleset) +DEFobjCurrIf(glbl) /* forward definitions */ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal); @@ -162,6 +164,9 @@ addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst) 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, inst->pszBindPort)); @@ -295,6 +300,7 @@ CODESTARTmodExit /* release objects we used */ objRelease(ruleset, CORE_COMPONENT); + objRelease(glbl, CORE_COMPONENT); objRelease(prop, CORE_COMPONENT); objRelease(net, LM_NET_FILENAME); objRelease(errmsg, CORE_COMPONENT); @@ -332,6 +338,7 @@ CODESTARTmodInit CODEmodInit_QueryRegCFSLineHdlr pRelpEngine = NULL; /* request objects we use */ + CHKiRet(objUse(glbl, CORE_COMPONENT)); CHKiRet(objUse(prop, CORE_COMPONENT)); CHKiRet(objUse(errmsg, CORE_COMPONENT)); CHKiRet(objUse(net, LM_NET_FILENAME)); diff --git a/runtime/im-helper.h b/runtime/im-helper.h index 6bbd6d70..5c58dcd8 100644 --- a/runtime/im-helper.h +++ b/runtime/im-helper.h @@ -47,7 +47,6 @@ std_checkRuleset(modConfData_t *modConf, instanceConf_t *inst) if(inst->pszBindRuleset == NULL) FINALIZE; -dbgprintf("ZZZZZ: inst->pszBindRuleset %s\n", inst->pszBindRuleset); localRet = ruleset.GetRuleset(modConf->pConf, &pRuleset, inst->pszBindRuleset); if(localRet == RS_RET_NOT_FOUND) { |