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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-07-24 12:37:25 +03:00
parent 4bb4b921cb f76e4cd61d
commit 26bf342e6b
21 changed files with 111 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1151,7 +1151,7 @@ bool create_rule(void* scanner, const char* name)
if (ruledef && (ruledef->name = MXS_STRDUP(name)))
{
ruledef->type = RT_UNDEFINED;
ruledef->type = RT_PERMISSION;
ruledef->on_queries = FW_OP_UNDEFINED;
ruledef->next = rstack->rule;
ruledef->active = NULL;

1
server/modules/filter/dbfwfilter/ruleparser.y
View File

@ -131,6 +131,7 @@ functionlist:
functionvalue:
FWTOK_CMP {if (!define_function_rule(scanner, $1)){YYERROR;}}
| FWTOK_STR {if (!define_function_rule(scanner, $1)){YYERROR;}}
| FWTOK_BTSTR {if (!define_function_rule(scanner, $1)){YYERROR;}}
;
optional: