Improve readability of base output in debugging.

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 2258f1c2d626b766cd8a64bafd19a87525acd114..3412fec5e4090afc03128da783faf2a06cae2587 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -36,6 +36,7 @@ int deny_severity = LOG_NOTICE;
 int            dtblsize;
 Connection     *c;
 
+static volatile sig_atomic_t slapd_shutdown = 0;
 static void    set_shutdown(int sig);
 static void    do_nothing  (int sig);
 
@@ -189,7 +190,7 @@ slapd_daemon(
 
                Debug( LDAP_DEBUG_CONNS, "before select active_threads %d\n",
                    active_threads, 0, 0 );
-#ifdef PREEMPTIVE_THREADS
+#if defined( HAVE_YIELDING_SELECT ) || defined( NO_THREADS )
                tvp = NULL;
 #else
                tvp = active_threads ? &zero : NULL;
@@ -304,13 +305,13 @@ slapd_daemon(
                        if ( c[ns].c_addr != NULL ) {
                                free( c[ns].c_addr );
                        }
-                       c[ns].c_addr = strdup( client_addr );
+                       c[ns].c_addr = ch_strdup( client_addr );
 
                        if ( c[ns].c_domain != NULL ) {
                                free( c[ns].c_domain );
                        }
 
-                       c[ns].c_domain = strdup( client_name == NULL
+                       c[ns].c_domain = ch_strdup( client_name == NULL
                                ? "" : client_name );
 
                        pthread_mutex_lock( &c[ns].c_dnmutex );