From 8bff81e0a9674449c59391d776051a0ee47e3081 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 29 Apr 2015 11:39:17 +0300
Subject: [PATCH] Fixed rule parsing failing if at_times is used with
 on_queries.

---
 server/modules/filter/dbfwfilter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/modules/filter/dbfwfilter.c b/server/modules/filter/dbfwfilter.c
index 9cdc2816f..58eedcc4b 100644
--- a/server/modules/filter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter.c
@@ -946,6 +946,8 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
 
 	while(tok)
 	{
+	    reparse_rule:
+
 	    if(strcmp(tok,"wildcard") == 0)
             {
                 ruledef->type = RT_WILDCARD;
@@ -974,7 +976,8 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
                 tok = strtok_r(NULL, " ,",&saveptr);
                 TIMERANGE *tr = NULL;
                 while(tok){
-
+		    if(strcmp(tok,"on_queries") == 0)
+			goto reparse_rule;
 		    if(!check_time(tok))
 		    {
 			skygw_log_write(LOGFILE_ERROR,"dbfwfilter: Rule parsing failed, malformed time definition: %s",tok);