X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=f92590872c214da1c03ba835257fdbd2f4b15cd3;hb=5747896ba081ff998fd97863de26d2f4af59bbd2;hp=ac710dfcbca31415b00715a83bc3be3cf2ac0a0d;hpb=da0c0360e4930142dc6c2c0b0512721af065f78a;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index ac710dfcbc..f92590872c 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -71,11 +71,6 @@ ldap_pvt_thread_mutex_t	gmtime_mutex;
 
 slap_counters_t			slap_counters;
 
-/*
- * these mutexes must be used when calling the entry2str()
- * routine since it returns a pointer to static data.
- */
-ldap_pvt_thread_mutex_t	entry2str_mutex;
 ldap_pvt_thread_mutex_t	replog_mutex;
 
 static const char* slap_name = NULL;
@@ -119,11 +114,16 @@ slap_init( int mode, const char *name )
 		return 1;
 	}
 
+	if ( entry_init() != 0 ) {
+		slap_debug |= LDAP_DEBUG_NONE;
+		Debug( LDAP_DEBUG_ANY,
+		    "%s: entry_init failed\n",
+		    name, 0, 0 );
+		return 1;
+	}
 
 	switch ( slapMode & SLAP_MODE ) {
 	case SLAP_SERVER_MODE:
-		ldap_pvt_thread_pool_init( &connection_pool,
-				connection_pool_max, 0);
 
 		/* FALLTHRU */
 	case SLAP_TOOL_MODE:
@@ -134,7 +134,8 @@ slap_init( int mode, const char *name )
 
 		slap_name = name;
 
-		ldap_pvt_thread_mutex_init( &entry2str_mutex );
+		ldap_pvt_thread_pool_init( &connection_pool,
+				connection_pool_max, 0);
 		ldap_pvt_thread_mutex_init( &replog_mutex );
 
 		ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
@@ -168,6 +169,8 @@ slap_init( int mode, const char *name )
 		if( rc == 0 ) {
 			rc = backend_init( );
 		}
+		if ( rc )
+			return rc;
 
 		break;