diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 10:56:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 10:56:19 +0200 |
| commit | 8812ffd58b59724c1bf5c1cae8c37740524274c4 (patch) | |
| tree | 87b26acde40f0f158f859d719c20916e7add9ec2 | |
| parent | 7fb358a76f2c6dd86b951cb1639d1787810830c2 (diff) | |
| parent | 136f6e097800742ec232c968b2bdd03bfab687f4 (diff) | |
| download | rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.tar.gz rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.tar.bz2 rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imrelp/imrelp.c
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imrelp/imrelp.c | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -574,6 +574,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 99fabd18..f4d9331c 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)); @@ -269,6 +274,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); @@ -299,6 +305,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)); |