diff --git a/cfg.lex b/cfg.lex index 731d00e9be1..2361687d5ff 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1192,9 +1192,9 @@ IMPORTFILE "import_file" {COM_LINE}!{SER_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_SER;} -{COM_LINE}!{KAMAILIO_CFG}{CR} { count(); +{COM_LINE}!{KAMAILIO_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_KAMAILIO;} -{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); +{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_MAX;} {PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0); @@ -1203,6 +1203,12 @@ IMPORTFILE "import_file" state = DEFINE_S; BEGIN(DEFINE_ID); } {PREP_START}{REDEF}{EAT_ABLE}+ { count(); pp_define_set_type(2); state = DEFINE_S; BEGIN(DEFINE_ID); } +{ID}{MINUS} { count(); + LOG(L_CRIT, + "error at %s line %d: '-' not allowed\n", + (finame)?finame:"cfg", line); + exit(-1); + } {ID} { count(); if (pp_define(yyleng, yytext)) return 1; state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); } @@ -1230,6 +1236,12 @@ IMPORTFILE "import_file" {PREP_START}{IFNDEF}{EAT_ABLE}+ { count(); if (pp_ifdef_type(0)) return 1; state = IFDEF_S; BEGIN(IFDEF_ID); } +{ID}{MINUS} { count(); + LOG(L_CRIT, + "error at %s line %d: '-' not allowed\n", + (finame)?finame:"cfg", line); + exit(-1); + } {ID} { count(); pp_ifdef_var(yyleng, yytext); state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); }