diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-29 10:16:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-29 10:16:49 +0100 |
| commit | 6bc461367408fbd9abb74ac31619ad2cef490fda (patch) | |
| tree | 96c012936bb0e629b208f0c86f40f105990c7f4c | |
| parent | fac3c09f0433ebe073e2572fe1eb0da5e598b7a6 (diff) | |
| parent | d1d0b27fc4c774aadad63d31893c03ed622b9b61 (diff) | |
| download | rsyslog-6bc461367408fbd9abb74ac31619ad2cef490fda.tar.gz rsyslog-6bc461367408fbd9abb74ac31619ad2cef490fda.tar.bz2 rsyslog-6bc461367408fbd9abb74ac31619ad2cef490fda.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | grammar/grammar.y | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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; } |