diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2013-07-11 10:56:16 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2013-07-11 10:56:16 +0200 |
| commit | 53bd9a94ec2c7ad1a009c6fb6655adea48746ca3 (patch) | |
| tree | f03bde08eb331ab76ff97b72a502c51aea3aba2b /plugins/imrelp/imrelp.c | |
| parent | 57fa85ee7f8c7319f746f238435c4ce6a0c67d95 (diff) | |
| parent | 02f28cd963a206910f2de1c0e1281c69de8dd99e (diff) | |
| download | rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.tar.gz rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.tar.bz2 rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.zip | |
Merge branch 'master' into v7-stats-scripts
Diffstat (limited to 'plugins/imrelp/imrelp.c')
| -rw-r--r-- | plugins/imrelp/imrelp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c index 74cfeb72..d04e41e1 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -157,6 +157,13 @@ onErr(void *pUsr, char *objinfo, char* errmesg, __attribute__((unused)) relpRetV } static void +onGenericErr(char *objinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) +{ + errmsg.LogError(0, RS_RET_RELP_ERR, "imrelp: librelp error '%s', object " + " '%s' - input may not work as intended", errmesg, objinfo); +} + +static void onAuthErr(void *pUsr, char *authinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) { instanceConf_t *inst = (instanceConf_t*) pUsr; @@ -288,6 +295,7 @@ addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst) CHKiRet(relpEngineSetEnableCmd(pRelpEngine, (uchar*) "syslog", eRelpCmdState_Required)); CHKiRet(relpEngineSetSyslogRcv2(pRelpEngine, onSyslogRcv)); CHKiRet(relpEngineSetOnErr(pRelpEngine, onErr)); + CHKiRet(relpEngineSetOnGenericErr(pRelpEngine, onGenericErr)); CHKiRet(relpEngineSetOnAuthErr(pRelpEngine, onAuthErr)); if (!glbl.GetDisableDNS()) { CHKiRet(relpEngineSetDnsLookupMode(pRelpEngine, 1)); @@ -516,6 +524,7 @@ CODESTARTfreeCnf inst = inst->next; free(del); } + free(pModConf->pszBindRuleset); ENDfreeCnf /* This is used to terminate the plugin. Note that the signal handler blocks |