From 4bcc9c7bdca5b16c018e516befa8828d13aa0446 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Sat, 4 Mar 2000 18:30:56 +0000 Subject: [PATCH] When loading a configuration file, set log defaults if and only if no "category default" clause was found in a logging statement. --- bin/named/server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index a30ad05827..bf43085523 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -962,14 +962,14 @@ load_configuration(const char *filename, ns_server_t *server, CHECKM(isc_logconfig_create(ns_g_lctx, &logc), "creating new logging configuration"); - CHECKM(ns_log_setdefaults(logc), - "setting up default logging defaults"); (void) dns_c_ctx_getlogging(configctx, &clog); - if (clog != NULL) { + if (clog != NULL) CHECKM(ns_log_configure(logc, clog), "configuring logging"); - } + else + CHECKM(ns_log_setdefaults(logc), + "setting up default logging defaults"); result = isc_logconfig_use(ns_g_lctx, logc); if (result != ISC_R_SUCCESS) {