summaryrefslogtreecommitdiffstats
path: root/grammar
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-09-15 08:00:23 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-09-15 08:00:23 +0200
commit6ce87411a6c93b674a9c813928bc853620a4ae3b (patch)
treeadc166e329c2803f2037a0c8ea2ca558b85cc970 /grammar
parentc55997638f8833daec34d7f51b9ff6694620f6f8 (diff)
downloadrsyslog-6ce87411a6c93b674a9c813928bc853620a4ae3b.tar.gz
rsyslog-6ce87411a6c93b674a9c813928bc853620a4ae3b.tar.xz
rsyslog-6ce87411a6c93b674a9c813928bc853620a4ae3b.zip
bugfix: config parser did not support properties with dashes in them
...inside property-based filters. Thanks to Gerrit Seré for reporting this.
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 f7691c4a..5c8542dd 100644
--- a/grammar/lexer.l
+++ b/grammar/lexer.l
@@ -156,7 +156,7 @@ int fileno(FILE *stream);
"module"[ \n\t]*"(" { yylval.objType = CNFOBJ_MODULE;
BEGIN INOBJ; return BEGINOBJ; }
"action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; }
-^[ \t]*:\$?[a-z]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\".*\" {
+^[ \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; }
"~" |