rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 15:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: some valid legacy PRI filters were flagged as errornous

Browse Source 
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.
This commit is contained in:
Rainer Gerhards 2012-09-21 11:57:55 +02:00
parent dc52b123fe
commit 1be79d5467
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@ Version 6.4.3 [V6-STABLE] 2012-??-??
- bugfix: sysklogd-emulating standard template was no longer present in v6 - bugfix: sysklogd-emulating standard template was no longer present in v6
This was obviously lost during the transition to the new config format. This was obviously lost during the transition to the new config format.
Thanks to Milan Bartos for alerting us and a patch! 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 Version 6.4.2 [V6-STABLE] 2012-09-20
- bugfix: potential abort, if action queue could not be properly started - bugfix: potential abort, if action queue could not be properly started

2
grammar/lexer.l
View File

@ -164,7 +164,7 @@ int fileno(FILE *stream);
"action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; } "action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; }
^[ \t]*:\$?[a-z\-]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\".*\" { ^[ \t]*:\$?[a-z\-]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\".*\" {
yylval.s = strdup(yytext); return PROPFILT; } 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]* | \-\/[^*][^\n]* |