summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-08-27 14:17:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-08-27 14:17:43 +0200
commit9eae07aa82db12205a31afc4ee2888ba50c3bc3a (patch)
treee89b794ccedbae3c46aa406f29fc5ce7a7f915b7
parent6e77a7261ade955a6dc9ac1bae5fda7e14908fb0 (diff)
parent8cd291a0c9eab23fa020d6560715a32c3370f78b (diff)
downloadrsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.tar.gz
rsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.tar.xz
rsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.zip
Merge branch 'v4-beta' into v4-devel
Conflicts: ChangeLog
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index df0b69bf..8a7a8f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,11 @@ Version 4.4.1 [v4-stable] (rgerhards), 2009-08-??
This resulted in build errors if no Java was present on the build system,
even though none of the selected option actually required Java.
(I forgot to backport a similar fix to newer releases).
+- bugfix (backport): omfwd segfault
+ Note that the orginal (higher version) patch states this happens only
+ when debugging mode is turned on. That statement is wrong: if debug
+ mode is turned off, the message is not being emitted, but the division
+ by zero in the actual parameters still happens.
---------------------------------------------------------------------------
Version 4.4.0 [v4-stable] (rgerhards), 2009-08-21
- bugfix: stderr/stdout were not closed to be able to emit error messages,