allow array of more generic syntaxes

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 59986a6009d36ac7399ecacb244848658dd990b6..61c6b5935bd1ef97400fea45d95ddcdf31822491 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1434,7 +1434,7 @@ slapd_daemon_init( const char *urls )
 
 #ifdef HAVE_SYSCONF
        dtblsize = sysconf( _SC_OPEN_MAX );
-#elif HAVE_GETDTABLESIZE
+#elif defined(HAVE_GETDTABLESIZE)
        dtblsize = getdtablesize();
 #else /* ! HAVE_SYSCONF && ! HAVE_GETDTABLESIZE */
        dtblsize = FD_SETSIZE;
@@ -1724,7 +1724,6 @@ slap_listener(
                {
                        uid_t uid;
                        gid_t gid;
-                       int rc;
 
 #ifdef LDAP_PF_LOCAL_SENDMSG
                        peerbv.bv_val = peerbuf;
@@ -1829,10 +1828,7 @@ slap_listener(
                dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
                peername, cflag, ssf,
                authid.bv_val ? &authid : NULL
-#ifdef LDAP_PF_LOCAL_SENDMSG
-               , &peerbv
-#endif
-       );
+               LDAP_PF_LOCAL_SENDMSG_ARG(&peerbv));
 
        if( authid.bv_val ) ch_free(authid.bv_val);
 
@@ -2538,10 +2534,7 @@ connectionless_init( void )
 
                c = connection_init( lr->sl_sd, lr, "", "",
                        CONN_IS_UDP, (slap_ssf_t) 0, NULL
-#ifdef LDAP_PF_LOCAL_SENDMSG
-                       , NULL
-#endif
-                       );
+                       LDAP_PF_LOCAL_SENDMSG_ARG(NULL));
 
                if ( !c ) {
                        Debug( LDAP_DEBUG_TRACE,
@@ -2657,7 +2650,7 @@ slap_sig_shutdown( int sig )
         * SIGBREAK is generated when a user logs out.
         */
 
-#if HAVE_NT_SERVICE_MANAGER && SIGBREAK
+#if defined(HAVE_NT_SERVICE_MANAGER) && defined(SIGBREAK)
        if (is_NT_Service && sig == SIGBREAK) {
                /* empty */;
        } else