diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 18:20:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 18:20:45 +0200 |
| commit | 32a882199a929b92bbc0b36c3e2d7d92c93d6e41 (patch) | |
| tree | 4501f3aba87be77196edcb79e38ab7eef7a0f400 | |
| parent | 7950361547b747fa3dad22ab8a39d17d9274891d (diff) | |
| parent | a41f3c34ab7d0e4e19d69f25f3c85d96966b8067 (diff) | |
| download | rsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.tar.gz rsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.tar.bz2 rsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.zip | |
Merge branch 'v6-stable' into v6-devel
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | grammar/lexer.l | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -51,6 +51,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 b006b75f..4f79c9aa 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -170,7 +170,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]* | |