diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-21 14:27:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-21 14:27:41 +0200 |
| commit | 13ecf8a6ef5a5b69819865a2b9b524d4c561f5de (patch) | |
| tree | 9de0040d5d4af84c980c19b0aa64de7551b063e8 /runtime/conf.c | |
| parent | 82fa17ae5621849790eb39ed046d58333ede347c (diff) | |
| download | rsyslog-13ecf8a6ef5a5b69819865a2b9b524d4c561f5de.tar.gz rsyslog-13ecf8a6ef5a5b69819865a2b9b524d4c561f5de.tar.xz rsyslog-13ecf8a6ef5a5b69819865a2b9b524d4c561f5de.zip | |
step: config handler setting from syslogd.c moved to rsconf.c
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 8e05609d..9fecc34d 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -296,7 +296,7 @@ finalize_it: * generalized. */ rsRetVal -doNameLine(rsconf_t *conf, uchar **pp, void* pVal) +doNameLine(uchar **pp, void* pVal) { DEFiRet; uchar *p; @@ -324,7 +324,7 @@ doNameLine(rsconf_t *conf, uchar **pp, void* pVal) switch(eDir) { case DIR_TEMPLATE: - tplAddLine(ourConf, szName, &p); + tplAddLine(loadConf, szName, &p); break; case DIR_OUTCHANNEL: ochAddLine(szName, &p); @@ -1125,7 +1125,7 @@ static rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) if((iRet = addAction(&pAction, pMod, pModData, pOMSR, (iRet == RS_RET_SUSPENDED)? 1 : 0)) == RS_RET_OK) { /* now check if the module is compatible with select features */ if(pMod->isCompatibleWithFeature(sFEATURERepeatedMsgReduction) == RS_RET_OK) - pAction->f_ReduceRepeated = bReduceRepeatMsgs; + pAction->f_ReduceRepeated = loadConf->globals.bReduceRepeatMsgs; else { dbgprintf("module is incompatible with RepeatedMsgReduction - turned off\n"); pAction->f_ReduceRepeated = 0; |