From ae31e3b0b563360e4ace20a8fa493cf62b708bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 5 Jan 2017 12:20:03 +0200 Subject: [PATCH] Only add default value if none is provided The default parameter values should only be added if the configuration doesn't have that parameter. --- server/core/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/core/config.c b/server/core/config.c index bf0b2e53c..4614df728 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -2678,7 +2678,8 @@ static void config_add_defaults(CONFIG_CONTEXT *ctx, const char *module, const c { for (int i = 0; mod->parameters[i].name; i++) { - if (mod->parameters[i].default_value) + if (mod->parameters[i].default_value && + config_get_param(ctx->parameters, mod->parameters[i].name) == NULL) { ss_dassert(config_param_is_valid(module, type, mod->parameters[i].name, mod->parameters[i].default_value, ctx));