[config parser] fix detection of conflicts between options and uservars

personal/stbuehler/wip
Thomas Porzelt 11 years ago
parent 3ef949bbb9
commit 2ebf367df5
  1. 7
      src/main/config_parser.rl

@ -791,6 +791,13 @@ static gboolean config_parser_include(liServer *srv, GList *ctx_stack, gchar *pa
return FALSE;
}
if (NULL != g_hash_table_lookup(srv->options, name->data.string->str)) {
WARNING(srv, "cannot define uservar with name '%s', an option with same name exists already", name->data.string->str);
li_value_free(name);
li_value_free(v);
return FALSE;
}
if (NULL != g_hash_table_lookup(srv->optionptrs, name->data.string->str)) {
WARNING(srv, "cannot define uservar with name '%s', an option with same name exists already", name->data.string->str);
li_value_free(name);

Loading…
Cancel
Save