Merge in latest from -current.

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 59c1d2eaf93d1363fb6f18c66fdf7b31e9f47241..c15c58b24a4c89aba1e42001fc11b9ace951f251 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -198,6 +198,9 @@ slapd_daemon(
                FD_ZERO( &readfds );
                FD_SET( tcps, &readfds );
 
+               zero.tv_sec = 0;
+               zero.tv_usec = 0;
+
                pthread_mutex_lock( &active_threads_mutex );
                Debug( LDAP_DEBUG_CONNS,
                    "listening for connections on %d, activity on:",
@@ -218,8 +221,6 @@ slapd_daemon(
                Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 );
                pthread_mutex_unlock( &new_conn_mutex );
 
-               zero.tv_sec = 0;
-               zero.tv_usec = 0;
                Debug( LDAP_DEBUG_CONNS, "before select active_threads %d\n",
                    active_threads, 0, 0 );
 #if    defined(THREAD_PREEMPTIVE) || defined(NO_THREADS)