hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rule parsing failing if at_times is used with on_queries.

Browse Source
This commit is contained in:
Markus Makela
2015-04-29 11:39:17 +03:00
parent bf7576a501
commit 8bff81e0a9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/filter/dbfwfilter.c
View File

@ -946,6 +946,8 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
while(tok) while(tok)
{ {
reparse_rule:
if(strcmp(tok,"wildcard") == 0) if(strcmp(tok,"wildcard") == 0)
{ {
ruledef->type = RT_WILDCARD; ruledef->type = RT_WILDCARD;
@ -974,7 +976,8 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
tok = strtok_r(NULL, " ,",&saveptr); tok = strtok_r(NULL, " ,",&saveptr);
TIMERANGE *tr = NULL; TIMERANGE *tr = NULL;
while(tok){ while(tok){
if(strcmp(tok,"on_queries") == 0)
goto reparse_rule;
if(!check_time(tok)) if(!check_time(tok))
{ {
skygw_log_write(LOGFILE_ERROR,"dbfwfilter: Rule parsing failed, malformed time definition: %s",tok); skygw_log_write(LOGFILE_ERROR,"dbfwfilter: Rule parsing failed, malformed time definition: %s",tok);