From d1d0b27fc4c774aadad63d31893c03ed622b9b61 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 27 Oct 2012 15:06:29 +0200 Subject: bugfix: ruleset()-object did only support a single statement --- ChangeLog | 1 + grammar/grammar.y | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3