summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-30 16:51:22 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-30 16:51:22 +0100
commitcaad1340d64a345fa9d1bfc3f902e898d6ee2f76 (patch)
tree6551a4ba5648443e6306a96b836aa599c17d4886
parent154147307442d572de930f09363b144c06802ca1 (diff)
downloadrsyslog-caad1340d64a345fa9d1bfc3f902e898d6ee2f76.tar.gz
rsyslog-caad1340d64a345fa9d1bfc3f902e898d6ee2f76.tar.xz
rsyslog-caad1340d64a345fa9d1bfc3f902e898d6ee2f76.zip
bugfix: correct default for escape ('#') character restored
This was accidently changed to '\\', thanks to David Lang for reporting the bug.
-rw-r--r--ChangeLog2
-rw-r--r--tools/syslogd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index afa1d7c5..de99e0a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 5.3.4 [DEVEL] (rgerhards), 2009-10-??
+- bugfix: correct default for escape ('#') character restored
+ This was accidently changed to '\\', thanks to David Lang for reporting
- added the capability to have ruleset-specific main message queues
This offers considerable additional flexibility AND superior performance
(in cases where multiple inputs now can avoid lock contention)
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 62d33677..270bf843 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -242,7 +242,7 @@ static int bLogStatusMsgs = DFLT_bLogStatusMsgs; /* log rsyslog start/stop/HUP m
static int bDebugPrintTemplateList = 1;/* output template list in debug mode? */
static int bDebugPrintCfSysLineHandlerList = 1;/* output cfsyslinehandler list in debug mode? */
static int bDebugPrintModuleList = 1;/* output module list in debug mode? */
-uchar cCCEscapeChar = '\\';/* character to be used to start an escape sequence for control chars */
+uchar cCCEscapeChar = '#';/* character to be used to start an escape sequence for control chars */
int bEscapeCCOnRcv = 1; /* escape control characters on reception: 0 - no, 1 - yes */
static int bErrMsgToStderr = 1; /* print error messages to stderr (in addition to everything else)? */
int bReduceRepeatMsgs; /* reduce repeated message - 0 - no, 1 - yes */