diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 12:26:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 12:26:28 +0200 |
| commit | 2952b9196a5c1cbcc940ddf237d469fa56bd5a04 (patch) | |
| tree | a71b0a382f92451187cb28d0db7b7ddc89a60e27 /plugins | |
| parent | 7c2183ee323dc062b0dde6bac4cd9c5afa4ab369 (diff) | |
| parent | 8812ffd58b59724c1bf5c1cae8c37740524274c4 (diff) | |
| download | rsyslog-2952b9196a5c1cbcc940ddf237d469fa56bd5a04.tar.gz rsyslog-2952b9196a5c1cbcc940ddf237d469fa56bd5a04.tar.xz rsyslog-2952b9196a5c1cbcc940ddf237d469fa56bd5a04.zip | |
Merge branch 'v6-stable' into v6-devel-input
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imrelp/imrelp.c | 7 |
1 files changed, 7 insertions, 0 deletions
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)); |