From: Howard Chu <hyc@openldap.org>
Date: Wed, 25 Jan 2006 01:36:18 +0000 (+0000)
Subject: ITS#4370 always init slap_daemon mutexes
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~269
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bebfc49d7136938e7fc55ad17bc023c2e0ff0d1e;p=openldap

ITS#4370 always init slap_daemon mutexes
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 85fbf5f3d8..01afde3584 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1121,6 +1121,12 @@ int slapd_daemon_init( const char *urls )
 
 	Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
 		urls ? urls : "<null>", 0, 0 );
+
+	ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex );
+#ifdef HAVE_TCPD
+	ldap_pvt_thread_mutex_init( &slap_daemon.tcpd_mutex );
+#endif
+
 	if( (rc = sockinit()) != 0 ) return rc;
 
 #ifdef HAVE_SYSCONF
@@ -1190,11 +1196,6 @@ int slapd_daemon_init( const char *urls )
 #endif
 
 	ldap_charray_free( u );
-	ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex );
-
-#ifdef HAVE_TCPD
-	ldap_pvt_thread_mutex_init( &slap_daemon.tcpd_mutex );
-#endif
 
 	return !i;
 }