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

diff --git a/CHANGES b/CHANGES
index e4ec658ee87be14bf25436ab95cd9bc1a47cc3b8..3415ef3b4b7a45fbf7de145d92ddcd43576ef02a 100644 (file)
--- 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 11c46eaddd0b9e9979958d5f7c9a5c9c469413ad..9dd435d8ee111f33cd56de769e2552e3694272f1 100644 (file)
--- 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 );
        }
 }