ITS#6949 fixup loglevel delete, consolidate redundant code

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 1c7de68187b63c0de15c38efe9949f0018694664..06e51c6ee22a76407ed2c8f0b29c591fbfb8f325 100644 (file)
--- 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;