From: Howard Chu <hyc@openldap.org>
Date: Sun, 28 Aug 2005 07:15:11 +0000 (+0000)
Subject: More for ITS#3937, pick up pre-set ldap_syslog values.
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~544
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f8a97897ad4b152347df1efdcc7452b1536d1ab0;p=openldap

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

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 6b75c27b91..2499369b6d 100644
--- 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);
 }