More for ITS#3937, pick up pre-set ldap_syslog values.

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 6b75c27b918a5dec33d15f91e08d23073e05b6ad..2499369b6d038459a2e1655fa5fa2daf4754f299 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1977,6 +1977,9 @@ config_loglevel(ConfigArgs *c) {
        }
 
        if (c->op == SLAP_CONFIG_EMIT) {
+               /* Get default or commandline slapd setting */
+               if ( ldap_syslog && !config_syslog )
+                       config_syslog = ldap_syslog;
                return mask_to_verbs( loglevel_ops, config_syslog, &c->rvalue_vals );
        } else if ( c->op == LDAP_MOD_DELETE ) {
                if ( !c->line ) {
@@ -2013,9 +2016,9 @@ config_loglevel(ConfigArgs *c) {
                        }
                }
                config_syslog |= level;
-               if ( slapMode & SLAP_SERVER_MODE ) {
-                       ldap_syslog = config_syslog;
-               }
+       }
+       if ( slapMode & SLAP_SERVER_MODE ) {
+               ldap_syslog = config_syslog;
        }
        return(0);
 }