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

Fix filters parameter processing

Browse Source 
The filter names for the service parameter `filters` weren't converted
into the new format. This caused a configuration error when a filter with
significant whitespace in its name was used in a service.
This commit is contained in:
Markus Mäkelä
2017-05-02 11:21:32 +03:00
parent fce0edce8e
commit dcbd91deee
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/core/maxscale/config.h
View File

@ -142,4 +142,11 @@ void config_add_module_params_json(const MXS_MODULE* mod,
const char** type_params, const char** type_params,
json_t* output); json_t* output);
/**
* @brief Convert section names to new format
*
* @param section Section name to fix
*/
void fix_section_name(char *section);
MXS_END_DECLS MXS_END_DECLS

2
server/core/service.cc
View File

@ -1222,6 +1222,8 @@ serviceSetFilters(SERVICE *service, char *filters)
ptr = strtok_r(filters, "|", &brkt); ptr = strtok_r(filters, "|", &brkt);
while (ptr) while (ptr)
{ {
fix_section_name(ptr);
n++; n++;
MXS_FILTER_DEF **tmp; MXS_FILTER_DEF **tmp;
if ((tmp = (MXS_FILTER_DEF **) MXS_REALLOC(flist, if ((tmp = (MXS_FILTER_DEF **) MXS_REALLOC(flist,