diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 14:46:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 14:46:47 +0200 |
| commit | 45b4f3fac96005753bc1a9ec8be0510e0554d065 (patch) | |
| tree | 978bfbc0a0bab66636d64eedd00d8d7860200f8a | |
| parent | 23d6a4f3fe748a777348075924b6353f669f5b56 (diff) | |
| parent | 650f537761c7b8813ef82b0b8343e2f5e100b360 (diff) | |
| download | rsyslog-45b4f3fac96005753bc1a9ec8be0510e0554d065.tar.gz rsyslog-45b4f3fac96005753bc1a9ec8be0510e0554d065.tar.xz rsyslog-45b4f3fac96005753bc1a9ec8be0510e0554d065.zip | |
Merge branch 'v4-devel'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/ruleset.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -505,6 +505,8 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? robustness - added new configure option that permits to disable and enable an extended testbench +- bugfix: segfault on HUP when "HUPIsRestart" was set to "on" + thanks varmojfekoj for the patch - bugfix: default for $OMFileFlushOnTXEnd was wrong ("off"). This, in default mode, caused buffered writing to be used, what means that it looked like no output were written or partial diff --git a/runtime/ruleset.c b/runtime/ruleset.c index df7f8daa..0584e8d6 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -448,6 +448,7 @@ destructAllActions(void) CHKiRet(llDestroy(&llRulesets)); CHKiRet(llInit(&llRulesets, rulesetDestructForLinkedList, keyDestruct, strcasecmp)); + pDfltRuleset = NULL; finalize_it: RETiRet; |