diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 11:57:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 11:57:55 +0200 |
commit | 1be79d5467badd914ddc5762a6510a304140ef5e (patch) | |
tree | 09c88fbef49f58f2fc5d2993d78db435bc1c71fe | |
parent | dc52b123feff7a8f35dd591639ab5d4dd7e53527 (diff) | |
download | rsyslog-1be79d5467badd914ddc5762a6510a304140ef5e.tar.gz rsyslog-1be79d5467badd914ddc5762a6510a304140ef5e.tar.xz rsyslog-1be79d5467badd914ddc5762a6510a304140ef5e.zip |
bugfix: some valid legacy PRI filters were flagged as errornous
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358
This happend to filters of the style "local0,local1.*", where the
multiple facilities were comma-separated.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | grammar/lexer.l | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -3,6 +3,10 @@ Version 6.4.3 [V6-STABLE] 2012-??-?? - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. Thanks to Milan Bartos for alerting us and a patch! +- bugfix: some valid legacy PRI filters were flagged as errornous + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 + This happend to filters of the style "local0,local1.*", where the + multiple facilities were comma-separated. --------------------------------------------------------------------------- Version 6.4.2 [V6-STABLE] 2012-09-20 - bugfix: potential abort, if action queue could not be properly started diff --git a/grammar/lexer.l b/grammar/lexer.l index 6ac7fd9a..caa0f24d 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -164,7 +164,7 @@ int fileno(FILE *stream); "action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; } ^[ \t]*:\$?[a-z\-]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\".*\" { yylval.s = strdup(yytext); return PROPFILT; } -^[ \t]*[\*a-z][,\*a-z]*[0-7]*\.[,!=;\.\*a-z0-7]+ { yylval.s = strdup(yytext); return PRIFILT; } +^[ \t]*[\*a-z][,\*a-z]*[0-7]*[,!=;\.\*a-z0-7]+ { yylval.s = strdup(yytext); return PRIFILT; } "~" | "*" | \-\/[^*][^\n]* | |