summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-07-05 14:44:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-07-05 14:44:11 +0200
commit650f537761c7b8813ef82b0b8343e2f5e100b360 (patch)
treee1d95c2f8ba4d0c1801d56f70f3e03078cf520eb
parent1bac66db05ecbc078d009c40fcb40093cc7b0bc8 (diff)
parent9de526eccd85324f8cff4968ac6b17fa66648c2b (diff)
downloadrsyslog-650f537761c7b8813ef82b0b8343e2f5e100b360.tar.gz
rsyslog-650f537761c7b8813ef82b0b8343e2f5e100b360.tar.xz
rsyslog-650f537761c7b8813ef82b0b8343e2f5e100b360.zip
Merge branch 'v4-stable' into v4-devel
-rw-r--r--ChangeLog2
-rw-r--r--runtime/ruleset.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 13d3bc81..bf2addbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-04-??
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 d98b4217..af61f24f 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -348,6 +348,7 @@ destructAllActions(void)
CHKiRet(llDestroy(&llRulesets));
CHKiRet(llInit(&llRulesets, rulesetDestructForLinkedList, keyDestruct, strcasecmp));
+ pDfltRuleset = NULL;
finalize_it:
RETiRet;