summaryrefslogtreecommitdiffstats
path: root/grammar
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-21 18:20:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-21 18:20:45 +0200
commit32a882199a929b92bbc0b36c3e2d7d92c93d6e41 (patch)
tree4501f3aba87be77196edcb79e38ab7eef7a0f400 /grammar
parent7950361547b747fa3dad22ab8a39d17d9274891d (diff)
parenta41f3c34ab7d0e4e19d69f25f3c85d96966b8067 (diff)
downloadrsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.tar.gz
rsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.tar.xz
rsyslog-32a882199a929b92bbc0b36c3e2d7d92c93d6e41.zip
Merge branch 'v6-stable' into v6-devel
Diffstat (limited to 'grammar')
-rw-r--r--grammar/lexer.l2
1 files changed, 1 insertions, 1 deletions
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]* |