From: Howard Chu <hyc@openldap.org>
Date: Sat, 5 May 2007 01:22:29 +0000 (+0000)
Subject: ITS#4949 make config_syslog accumulate across multiple values
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~524
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dda5e199043b5e67ef85c8dacc79a17e74f68d5d;p=openldap

ITS#4949 make config_syslog accumulate across multiple values
Can set to zero to explicitly clear it. (As well as just deleting
all values.)
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index c1b8b4bfbf..07727a4855 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2576,8 +2576,6 @@ config_loglevel(ConfigArgs *c) {
 		return 0;
 	}
 
-	config_syslog = 0;
-
 	for( i=1; i < c->argc; i++ ) {
 		int	level;
 
@@ -2596,7 +2594,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;