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

Addition of alternative truth values in the config file, on, off, true

Browse Source 
or false can now be used as well as 0 and 1 when defining the
enable_root_user parameter.
This commit is contained in:
Mark Riddoch
2014-05-30 18:14:21 +01:00
parent 752f28ce48
commit 589ed75d32
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/config.c
View File

@ -58,6 +58,7 @@ static char *config_get_value(CONFIG_PARAMETER *, const char *);
static int handle_global_item(const char *, const char *); static int handle_global_item(const char *, const char *);
static void global_defaults(); static void global_defaults();
static void check_config_objects(CONFIG_CONTEXT *context); static void check_config_objects(CONFIG_CONTEXT *context);
static int config_truth_value(char *str);
static char *config_file = NULL; static char *config_file = NULL;
static GATEWAY_CONF gateway; static GATEWAY_CONF gateway;
@ -256,7 +257,7 @@ int error_count = 0;
"max_slave_connections"); "max_slave_connections");
if (enable_root_user) if (enable_root_user)
serviceEnableRootUser(obj->element, atoi(enable_root_user)); serviceEnableRootUser(obj->element, config_truth_value(enable_root_user));
if (!auth) if (!auth)
auth = config_get_value(obj->parameters, "auth"); auth = config_get_value(obj->parameters, "auth");
@ -1253,3 +1254,24 @@ bool config_set_qualified_param(
return succp; return succp;
} }
/**
* Used for boolean settings where values may be 1, yes or true
* to enable a setting or -, no, false to disable a setting.
*
* @param str String to convert to a boolean
* @return Truth value
*/
static int
config_truth_value(char *str)
{
if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0)
{
return 1;
}
if (strcasecmp(str, "flase") == 0 || strcasecmp(str, "off") == 0)
{
return 0;
}
return atoi(str);
}