summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-27 15:06:29 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-27 15:06:29 +0200
commitd1d0b27fc4c774aadad63d31893c03ed622b9b61 (patch)
tree9deca3b2ada19d40cff66cd00b3b41918d9d264b
parent0d762b750988d47cfec96ee6e3bdca9ea15ecc96 (diff)
downloadrsyslog-d1d0b27fc4c774aadad63d31893c03ed622b9b61.tar.gz
rsyslog-d1d0b27fc4c774aadad63d31893c03ed622b9b61.tar.bz2
rsyslog-d1d0b27fc4c774aadad63d31893c03ed622b9b61.zip
bugfix: ruleset()-object did only support a single statement
-rw-r--r--ChangeLog1
-rw-r--r--grammar/grammar.y2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cacb81ca..b0d055ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
----------------------------------------------------------------------------
Version 7.2.1 [v7-stable] 2012-10-??
+- bugfix: ruleset()-object did only support a single statement
- added -D rsyslogd option to enable config parser debug mode
- improved syntax error messages by outputting the error token
- the rsyslog core now suspeneds actions after 10 failures in a row
diff --git a/grammar/grammar.y b/grammar/grammar.y
index 343daaaa..df673b71 100644
--- a/grammar/grammar.y
+++ b/grammar/grammar.y
@@ -131,7 +131,7 @@ obj: BEGINOBJ nvlst ENDOBJ { $$ = cnfobjNew($1, $2); }
{ $$ = cnfobjNew(CNFOBJ_TPL, $2);
$$->subobjs = $5;
}
- | BEGIN_RULESET nvlst ENDOBJ '{' stmt '}'
+ | BEGIN_RULESET nvlst ENDOBJ '{' script '}'
{ $$ = cnfobjNew(CNFOBJ_RULESET, $2);
$$->script = $5;
}