summaryrefslogtreecommitdiff
path: root/libunbound/context.c
diff options
context:
space:
mode:
Diffstat (limited to 'libunbound/context.c')
-rw-r--r--libunbound/context.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libunbound/context.c b/libunbound/context.c
index 20e3680ec3bca..b8fe87d2e580d 100644
--- a/libunbound/context.c
+++ b/libunbound/context.c
@@ -57,9 +57,16 @@ context_finalize(struct ub_ctx* ctx)
{
struct config_file* cfg = ctx->env->cfg;
verbosity = cfg->verbosity;
- if(ctx->logfile_override)
+ if(ctx_logfile_overridden && !ctx->logfile_override) {
+ log_file(NULL); /* clear that override */
+ ctx_logfile_overridden = 0;
+ }
+ if(ctx->logfile_override) {
+ ctx_logfile_overridden = 1;
log_file(ctx->log_out);
- else log_init(cfg->logfile, cfg->use_syslog, NULL);
+ } else {
+ log_init(cfg->logfile, cfg->use_syslog, NULL);
+ }
config_apply(cfg);
if(!modstack_setup(&ctx->mods, cfg->module_conf, ctx->env))
return UB_INITFAIL;