From 35f217ce69b6dbcdc16ff36ef02323ab3257d9df Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 12 Sep 2012 12:11:12 +0200 Subject: forward-compatibility patch for $ruleset processing v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change. --- grammar/grammar.y | 2 ++ grammar/lexer.l | 3 +++ 2 files changed, 5 insertions(+) diff --git a/grammar/grammar.y b/grammar/grammar.y index 8371f854..29ff02fe 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -69,6 +69,7 @@ extern int yyerror(char*); %token BEGIN_TPL %token STOP %token LEGACY_ACTION +%token LEGACY_RULESET %token PRIFILT %token PROPFILT %token BSD_TAG_SELECTOR @@ -129,6 +130,7 @@ conf: /* empty (to end recursion) */ | conf obj { cnfDoObj($2); } | conf rule { cnfDoRule($2); } | conf cfsysline { cnfDoCfsysline($2); } + | conf LEGACY_RULESET { cnfDoCfsysline($2); } | conf BSD_TAG_SELECTOR { cnfDoBSDTag($2); } | conf BSD_HOST_SELECTOR { cnfDoBSDHost($2); } obj: BEGINOBJ nvlst ENDOBJ { $$ = cnfobjNew($1, $2); } diff --git a/grammar/lexer.l b/grammar/lexer.l index c5e7bf7d..0faacf2e 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -192,6 +192,9 @@ int fileno(FILE *stream); if(!strncasecmp(yytext, "$includeconfig ", 14)) { yyless(14); BEGIN INCL; + } else if(!strncasecmp(yytext, "$ruleset ", 9)) { + yylval.s = strdup(yytext); + return LEGACY_RULESET; } else { yylval.s = strdup(yytext); return CFSYSLINE; -- cgit v1.2.3