Merge branch 'develop' into MAX-324

This commit is contained in:
Markus Makela
2015-02-20 04:45:48 +02:00
28 changed files with 857 additions and 423 deletions

View File

@ -71,7 +71,6 @@ static char *config_get_value(CONFIG_PARAMETER *, const char *);
static int handle_global_item(const char *, const char *);
static void global_defaults();
static void check_config_objects(CONFIG_CONTEXT *context);
static int config_truth_value(char *str);
static int internalService(char *router);
static char *config_file = NULL;
@ -1902,14 +1901,14 @@ bool config_set_qualified_param(
* @param str String to convert to a boolean
* @return Truth value
*/
static int
int
config_truth_value(char *str)
{
if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0)
if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0 || strcasecmp(str, "yes") == 0)
{
return 1;
}
if (strcasecmp(str, "false") == 0 || strcasecmp(str, "off") == 0)
if (strcasecmp(str, "false") == 0 || strcasecmp(str, "off") == 0 || strcasecmp(str, "no") == 0)
{
return 0;
}