From: Howard Chu <hyc@openldap.org>
Date: Fri, 8 Jun 2007 10:07:34 +0000 (+0000)
Subject: ITS#4949 config_syslog fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3fccb7783885f4ce218b9035fee47e532941186;p=thirdparty%2Fopenldap.git

ITS#4949 config_syslog fix from HEAD
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 427c0b231a..73d85230fd 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2216,8 +2216,6 @@ config_loglevel(ConfigArgs *c) {
 		return 0;
 	}
 
-	config_syslog = 0;
-
 	for( i=1; i < c->argc; i++ ) {
 		int	level;
 
@@ -2236,7 +2234,11 @@ config_loglevel(ConfigArgs *c) {
 				return( 1 );
 			}
 		}
-		config_syslog |= level;
+		/* Explicitly setting a zero clears all the levels */
+		if ( level )
+			config_syslog |= level;
+		else
+			config_syslog = 0;
 	}
 	if ( slapMode & SLAP_SERVER_MODE ) {
 		ldap_syslog = config_syslog;