diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 12:22:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-21 12:22:59 +0200 |
| commit | e072512e464cc7261eda7a735e6af6fd896beb11 (patch) | |
| tree | 2509b5e9b7bf09f850482331a3c57f0018a4a9ad /grammar | |
| parent | 9c4d8161d882657d6a5d50a28d664b0dc49d5da0 (diff) | |
| parent | 1be79d5467badd914ddc5762a6510a304140ef5e (diff) | |
| download | rsyslog-e072512e464cc7261eda7a735e6af6fd896beb11.tar.gz rsyslog-e072512e464cc7261eda7a735e6af6fd896beb11.tar.xz rsyslog-e072512e464cc7261eda7a735e6af6fd896beb11.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 172d4baf..8d7f2f2f 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]* | |