summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-19 15:49:26 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-19 15:49:26 +0100
commitbd03b86c6322c82fc9f667122f4365e339f28ccc (patch)
tree646b060c6c39abf45037555c7c8ff483a40ea25f
parent9cfa072caa0ba1863c89ae6b41d1c5838b9a42b0 (diff)
downloadrsyslog-bd03b86c6322c82fc9f667122f4365e339f28ccc.tar.gz
rsyslog-bd03b86c6322c82fc9f667122f4365e339f28ccc.tar.xz
rsyslog-bd03b86c6322c82fc9f667122f4365e339f28ccc.zip
bugfix: -d did not enable display of debug messages
regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug
-rw-r--r--ChangeLog3
-rw-r--r--tools/syslogd.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 837b1cb4..29383818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 4.5.8 [v4-beta] (rgerhards), 2010-01-??
+- bugfix: -d did not enable display of debug messages
+ regression from introduction of "debug on demand" mode
+ Thanks to Michael Biebl for reporting this bug
- bugfix: blanks inside file names did not terminate file name parsing.
This could reslult in the whole rest of a line (including comments)
to be treated as file name in "write to file" actions.
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 3dd51adf..ab8f015d 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -3203,6 +3203,7 @@ int realMain(int argc, char **argv)
iCompatibilityMode = atoi(optarg);
break;
case 'd': /* debug - must be handled now, so that debug is active during init! */
+ debugging_on = 1;
Debug = 1;
break;
case 'e': /* log every message (no repeat message supression) */