diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
commit | 7f4972b9fa132c7e5c8077f58e3e2845326884af (patch) | |
tree | 1100978c1a2c559d5431c71d6d40ea2bcb97317f | |
parent | 452fb9282d3c53ce2a7256adfc1948b10b5b532e (diff) | |
parent | 939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (diff) | |
download | rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.gz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.xz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.zip |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
runtime/queue.c
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | runtime/conf.c | 3 | ||||
-rw-r--r-- | tools/syslogd.c | 1 |
3 files changed, 23 insertions, 1 deletions
@@ -1,5 +1,8 @@ --------------------------------------------------------------------------- Version 5.3.7 [BETA] (rgerhards), 2010-01-?? +- bugfix: potential segfaults during queue shutdown + (bugs require certain non-standard settings to appear) + Thanks to varmojfekoj for the patch [imported from 4.5.8] - bugfix: rsyslog hangs when writing to a named pipe which nobody was reading. Thanks to Michael Biebl for reporting this bug. Bugzilla entry: http://bugzilla.adiscon.com/show_bug.cgi?id=169 @@ -313,6 +316,21 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? See ticket for details: http://bugzilla.adiscon.com/show_bug.cgi?id=150 - imported changes from 4.5.6 and below --------------------------------------------------------------------------- +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. + Thanks to Jack for reporting this issue. +- bugfix: rsyslog hang when writing to a named pipe which nobody was + reading. Thanks to Michael Biebl for reporting this bug. + Bugzilla entry: http://bugzilla.adiscon.com/show_bug.cgi?id=169 +- bugfix: potential segfaults during queue shutdown + (bugs require certain non-standard settings to appear) + Thanks to varmojfekoj for the patch +--------------------------------------------------------------------------- Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18 - added a so-called "On Demand Debug" mode, in which debug output can be generated only after the process has started, but not right from @@ -490,6 +508,8 @@ Version 4.4.3 [v4-stable] (rgerhards), 2009-10-?? This was a regression from the time() optimizations done in v4. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=143 Thanks to Klaus Tachtler for reporting this bug. +- bugfix: potential segfault on queue shutdown + Thanks to varmojfekoj for the patch. - bugfix: potential hang condition on queue shutdown [imported from v3-stable] - bugfix: segfault on startup when -q or -Q option was given diff --git a/runtime/conf.c b/runtime/conf.c index d6e6ccf6..e7c1576f 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -567,6 +567,7 @@ finalize_it: * rgerhards, 2007-07-25 * updated to include OMSR pointer -- rgerhards, 2007-07-27 * updated to include template name -- rgerhards, 2008-03-28 + * rgerhards, 2010-01-19: file names end at the first space */ rsRetVal cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *pszTpl) @@ -579,7 +580,7 @@ cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int pName = pFileName; i = 1; /* we start at 1 so that we reseve space for the '\0'! */ - while(*p && *p != ';' && i < MAXFNAME) { + while(*p && *p != ';' && *p != ' ' && i < MAXFNAME) { *pName++ = *p++; ++i; } 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) */ |