diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-28 12:34:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-28 12:34:01 +0200 |
| commit | 0714cce5bb2c89beeeaece259f11ee4cedce02c4 (patch) | |
| tree | 7416c0e94b9f1d88615492bd19400e5d649151bf | |
| parent | f2528ec101eb660560c7ec327d440cbb17f04f14 (diff) | |
| download | rsyslog-0714cce5bb2c89beeeaece259f11ee4cedce02c4.tar.gz rsyslog-0714cce5bb2c89beeeaece259f11ee4cedce02c4.tar.xz rsyslog-0714cce5bb2c89beeeaece259f11ee4cedce02c4.zip | |
bugfix: facility local<x> was not correctly interpreted in legacy filters
Was only accepted if it was the first PRI in a multi-filter PRI.
Thanks to forum user Mark for bringing this to our attention.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | grammar/lexer.l | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,8 @@ --------------------------------------------------------------------------- Version 6.3.7 [DEVEL] 2011-0?-?? +- bugfix: facility local<x> was not correctly interpreted in legacy filters + Was only accepted if it was the first PRI in a multi-filter PRI. + Thanks to forum user Mark for bringing this to our attention. - bugfix: imuxsock did no longer ignore message-provided timestamp, if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281 diff --git a/grammar/lexer.l b/grammar/lexer.l index 5c8542dd..a3f8bedd 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -158,7 +158,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-z]+ { yylval.s = strdup(yytext); return PRIFILT; } +^[ \t]*[\*a-z][,\*a-z]*[0-7]*\.[,!=;\.\*a-z0-7]+ { yylval.s = strdup(yytext); return PRIFILT; } "~" | "*" | \-\/[^*][^\n]* | |