summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--grammar/grammar.y2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37ce01dd..ba4bf17a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ Version 7.3.0 [devel] 2012-10-09
This is controlled by the new action parameter "VeryReliableZip".
----------------------------------------------------------------------------
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 42da0efc..c5bad689 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;
}