summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:09:48 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:09:48 +0100
commit7f4972b9fa132c7e5c8077f58e3e2845326884af (patch)
tree1100978c1a2c559d5431c71d6d40ea2bcb97317f /tools
parent452fb9282d3c53ce2a7256adfc1948b10b5b532e (diff)
parent939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (diff)
downloadrsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.gz
rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.xz
rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.zip
Merge branch 'v4-beta' into beta
Conflicts: ChangeLog runtime/queue.c
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 185852b6..21df6d6c 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2430,6 +2430,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) */