From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 6 Dec 2006 11:40:25 +0000 (+0000)
Subject: don't use conditionals in macro arguments (ITS#4769)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_31~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c61aa299dd6e4382efd714c9da693997a18d6015;p=thirdparty%2Fopenldap.git

don't use conditionals in macro arguments (ITS#4769)
---

diff --git a/CHANGES b/CHANGES
index e4ec658ee8..3415ef3b4b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.3.31 Engineering
 	Fixed slapd group ACL caching when proxyAuthz'ing (ITS#4760)
 	Fixed slapd "group" authz default member parsing (ITS#4761)
 	Fixed slapd DN parsing in bindconf_parse (ITS#4766)
+	Fixed slapd conditional in macro argument (ITS#4769)
 	Fixed slapd-bdb/hdb/ldbm slap_add_opattrs error checking
 	Documentation
 		Fixed typo in slapo-retcode(5) man page (ITS#4753)
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 11c46eaddd..9dd435d8ee 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -738,9 +738,11 @@ connection_destroy( Connection *c )
 	if ( sd != AC_SOCKET_INVALID ) {
 		slapd_remove( sd, sb, 1, 0, 0 );
 
-		Statslog( LDAP_DEBUG_STATS, (close_reason
-									 ? "conn=%lu fd=%ld closed (%s)\n"
-									 : "conn=%lu fd=%ld closed\n"),
+		if ( close_reason == NULL ) {
+			close_reason = "";
+		}
+
+		Statslog( LDAP_DEBUG_STATS, "conn=%lu fd=%ld closed (%s)\n",
 			connid, (long) sd, close_reason, 0, 0 );
 	}
 }