From: Howard Chu <hyc@openldap.org>
Date: Thu, 30 Sep 2021 03:23:29 +0000 (+0100)
Subject: ITS#6949 fixup loglevel delete, consolidate redundant code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66c62841190a3d5b8c7acaca7f7623d017df7615;p=thirdparty%2Fopenldap.git

ITS#6949 fixup loglevel delete, consolidate redundant code
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 1c7de68187..06e51c6ee2 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -4009,12 +4009,7 @@ config_loglevel(ConfigArgs *c) {
 			i = verb_to_mask( c->line, loglevel_ops );
 			config_syslog &= ~loglevel_ops[i].mask;
 		}
-		if ( slapMode & SLAP_SERVER_MODE ) {
-			slap_debug = slap_debug_orig;
-			if ( !logfile_only )
-				ldap_syslog = config_syslog;
-		}
-		return 0;
+		goto reset;
 	}
 
 	for( i=1; i < c->argc; i++ ) {
@@ -4041,6 +4036,8 @@ config_loglevel(ConfigArgs *c) {
 		else
 			config_syslog = 0;
 	}
+
+reset:
 	if ( slapMode & SLAP_SERVER_MODE ) {
 		if ( logfile_only ) {
 			slap_debug = slap_debug_orig | config_syslog;