diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-28 15:09:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-28 15:09:56 +0200 |
| commit | d3173826268b18d38d67525d8d38083176742c8c (patch) | |
| tree | 390efcefe119f6ea8d7ee8b0640990eca90d8004 /tools/omusrmsg.c | |
| parent | 9a9282b86c785d7c0b67a0b546748e3591a487a2 (diff) | |
| download | rsyslog-d3173826268b18d38d67525d8d38083176742c8c.tar.gz rsyslog-d3173826268b18d38d67525d8d38083176742c8c.tar.bz2 rsyslog-d3173826268b18d38d67525d8d38083176742c8c.zip | |
bugfix: omusrsmsg incorrect return state & config warning handling
During config file processing, Omusrmsg often incorrectly returned a
warning status, even when no warning was present (caused by
uninitialized variable). Also, the core handled warning messages
incorrectly, and treated them as errors. As a result, omusrmsg
(most often) could not properly be loaded. Note that this only
occurs with legacy config action syntax. This was a regression
caused by an incorrect merge in to the 6.3.x codebase.
Thanks to Stefano Mason for alerting us of this bug.
Diffstat (limited to 'tools/omusrmsg.c')
| -rw-r--r-- | tools/omusrmsg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e57d7ef9..a7df9243 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -385,6 +385,7 @@ BEGINparseSelectorAct int bHadWarning; CODESTARTparseSelectorAct CODE_STD_STRING_REQUESTparseSelectorAct(1) + bHadWarning = 0; if(!strncmp((char*) p, ":omusrmsg:", sizeof(":omusrmsg:") - 1)) { p += sizeof(":omusrmsg:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ } else { |