summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarmojfekoj <theinric@redhat.com>2009-05-28 16:01:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-28 16:01:34 +0200
commitd8ba1a0d9f1f90c250cc2405f87be151ac609968 (patch)
tree8f5556545c5a83c69cea9fd0885f52c55c77a1ae
parent362c006f0ff9f917adfa8a60931e339d31b4699a (diff)
downloadrsyslog-d8ba1a0d9f1f90c250cc2405f87be151ac609968.tar.gz
rsyslog-d8ba1a0d9f1f90c250cc2405f87be151ac609968.tar.xz
rsyslog-d8ba1a0d9f1f90c250cc2405f87be151ac609968.zip
bugfix: internal messages were emitted to whatever file had fd2
...when rsyslogd ran in forked mode (as usual!) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r--ChangeLog3
-rw-r--r--tools/syslogd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d3f6fd3d..6e7f552d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+- bugfix: internal messages were emitted to whatever file had fd2 when
+ rsyslogd ran in forked mode (as usual!)
+ Thanks to varmojfekoj for the patch
---------------------------------------------------------------------------
Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
- bugfix: light and full delay watermarks had invalid values, badly
diff --git a/tools/syslogd.c b/tools/syslogd.c
index b0d6fa25..1840030b 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -925,7 +925,7 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags)
* permits us to process unmodified config files which otherwise contain a
* supressor statement.
*/
- if(bErrMsgToStderr || iConfigVerify) {
+ if(((Debug || NoFork) && bErrMsgToStderr) || iConfigVerify) {
fprintf(stderr, "rsyslogd: %s\n", msg);
}