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

Fix for bug 493 - Multiple config file sections with the same name

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-01 17:18:15 +01:00
parent 60d6b5b699
commit a4ae7ea139
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/core/config.c
View File

@ -102,7 +102,7 @@ handler(void *userdata, const char *section, const char *name, const char *value
{ {
CONFIG_CONTEXT *cntxt = (CONFIG_CONTEXT *)userdata; CONFIG_CONTEXT *cntxt = (CONFIG_CONTEXT *)userdata;
CONFIG_CONTEXT *ptr = cntxt; CONFIG_CONTEXT *ptr = cntxt;
CONFIG_PARAMETER *param; CONFIG_PARAMETER *param, *p1;
if (strcmp(section, "gateway") == 0 || strcasecmp(section, "MaxScale") == 0) if (strcmp(section, "gateway") == 0 || strcasecmp(section, "MaxScale") == 0)
{ {
@ -125,6 +125,23 @@ CONFIG_PARAMETER *param;
ptr->element = NULL; ptr->element = NULL;
cntxt->next = ptr; cntxt->next = ptr;
} }
/* Check to see if the paramter already exists for the section */
p1 = ptr->parameters;
while (p1)
{
if (!strcmp(p1->name, name))
{
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Configuration object '%s' has multiple "
"parameters names '%s'.",
ptr->object, name)));
return 0;
}
p1 = p1->next;
}
if ((param = (CONFIG_PARAMETER *)malloc(sizeof(CONFIG_PARAMETER))) == NULL) if ((param = (CONFIG_PARAMETER *)malloc(sizeof(CONFIG_PARAMETER))) == NULL)
return 0; return 0;
param->name = strdup(name); param->name = strdup(name);