diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 18:20:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 18:20:28 +0200 |
| commit | aecd8a8a82ce57fb306cf8a1d6230a76ca22d0ad (patch) | |
| tree | d63f035167b0732e3d4b539a7c45be0c9d24d5e2 /grammar | |
| parent | e072512e464cc7261eda7a735e6af6fd896beb11 (diff) | |
| parent | a41f3c34ab7d0e4e19d69f25f3c85d96966b8067 (diff) | |
| download | rsyslog-aecd8a8a82ce57fb306cf8a1d6230a76ca22d0ad.tar.gz rsyslog-aecd8a8a82ce57fb306cf8a1d6230a76ca22d0ad.tar.xz rsyslog-aecd8a8a82ce57fb306cf8a1d6230a76ca22d0ad.zip | |
Merge branch 'v6-stable' into master-newruleset
Conflicts:
grammar/lexer.l
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/lexer.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grammar/lexer.l b/grammar/lexer.l index 8d7f2f2f..38703f25 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -176,7 +176,7 @@ int fileno(FILE *stream); "action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; } ^[ \t]*:\$?[a-z\-]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\".*\" { yylval.s = strdup(rmLeadingSpace(yytext)); return PROPFILT; } -^[ \t]*[\*a-z][,\*a-z]*[0-7]*[,!=;\.\*a-z0-7]+ { yylval.s = strdup(rmLeadingSpace(yytext)); return PRIFILT; } +^[ \t]*[\*a-z][\*a-z]*[0-7]*[\.,][,!=;\.\*a-z0-7]+ { yylval.s = strdup(rmLeadingSpace(yytext)); return PRIFILT; } "~" | "*" | \-\/[^*][^\n]* | |