diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-01 18:26:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-01 18:26:48 +0200 |
| commit | 81c8658769962dcc988734b23e354dfb1e54fcb0 (patch) | |
| tree | 9e283433585c84fcc7c5c4e854b7e934acbfc2e3 /runtime/rsconf.c | |
| parent | b5be2270e0cba2e19851dcef9e5b539e2ef23197 (diff) | |
| download | rsyslog-81c8658769962dcc988734b23e354dfb1e54fcb0.tar.gz rsyslog-81c8658769962dcc988734b23e354dfb1e54fcb0.tar.xz rsyslog-81c8658769962dcc988734b23e354dfb1e54fcb0.zip | |
bugfix: ruleset(){} directive errornously changed default ruleset
much like the $ruleset legacy conf statement. This potentially lead
to statements being assigned to the wrong ruleset.
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 97680795..ad588832 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -871,6 +871,7 @@ setCurrRuleset(void __attribute__((unused)) *pVal, uchar *pszName) CHKiRet(ruleset.Construct(&pRuleset)); CHKiRet(ruleset.SetName(pRuleset, pszName)); CHKiRet(ruleset.ConstructFinalize(ourConf, pRuleset)); + rulesetSetCurrRulesetPtr(pRuleset); } else { ABORT_FINALIZE(localRet); } @@ -1072,6 +1073,7 @@ initLegacyConf(void) ruleset.Construct(&pRuleset); ruleset.SetName(pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset")); ruleset.ConstructFinalize(loadConf, pRuleset); + rulesetSetCurrRulesetPtr(pRuleset); /* now register config handlers */ CHKiRet(regCfSysLineHdlr((uchar *)"sleep", 0, eCmdHdlrGoneAway, |