summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-04-12 09:12:05 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-04-12 09:12:05 +0200
commit6773add66a5b369c33740b794f1a81b1a3bd1aa2 (patch)
tree56ca6473603ed6ea9ded5f9a65e804f96efeab33
parent08a63f4987b7bfd694a85b53b3385af3bda3ad2f (diff)
downloadrsyslog-6773add66a5b369c33740b794f1a81b1a3bd1aa2.tar.gz
rsyslog-6773add66a5b369c33740b794f1a81b1a3bd1aa2.tar.bz2
rsyslog-6773add66a5b369c33740b794f1a81b1a3bd1aa2.zip
bugfix: parameter action.execOnlyWhenPreviousIsSuspended was accidently of integer-type
For obvious reasons, it needs to be boolean. Note that this change can break existing configurations if they circumvented the problem by using 0/1 values.
-rw-r--r--ChangeLog4
-rw-r--r--action.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4546db6..0fe084ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@ Version 7.2.7 [v7-stable] 2013-03-??
To use that functionality, legacy rsyslog.conf syntax had to be used.
Also, the doc was missing information on the "ParseTrusted" set of
config directives.
+- bugfix: parameter action.execOnlyWhenPreviousIsSuspended was accidently
+ of integer-type. For obvious reasons, it needs to be boolean. Note
+ that this change can break existing configurations if they circumvented
+ the problem by using 0/1 values.
- doc bugfix: rsyslog.conf man page had invalid file format info
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=418
----------------------------------------------------------------------------
diff --git a/action.c b/action.c
index 8fc92e56..7e228767 100644
--- a/action.c
+++ b/action.c
@@ -188,7 +188,7 @@ static struct cnfparamdescr cnfparamdescr[] = {
{ "action.execonlyeverynthtime", eCmdHdlrInt, 0 }, /* legacy: actionexeconlyeverynthtime */
{ "action.execonlyeverynthtimetimeout", eCmdHdlrInt, 0 }, /* legacy: actionexeconlyeverynthtimetimeout */
{ "action.execonlyonceeveryinterval", eCmdHdlrInt, 0 }, /* legacy: actionexeconlyonceeveryinterval */
- { "action.execonlywhenpreviousissuspended", eCmdHdlrInt, 0 }, /* legacy: actionexeconlywhenpreviousissuspended */
+ { "action.execonlywhenpreviousissuspended", eCmdHdlrBinary, 0 }, /* legacy: actionexeconlywhenpreviousissuspended */
{ "action.repeatedmsgcontainsoriginalmsg", eCmdHdlrBinary, 0 }, /* legacy: repeatedmsgcontainsoriginalmsg */
{ "action.resumeretrycount", eCmdHdlrInt, 0 }, /* legacy: actionresumeretrycount */
{ "action.resumeinterval", eCmdHdlrInt, 0 }