ITS#4780 plug leak

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 7496dc42f618a26804b3b0fba5994ef893dadafa..f92590872c214da1c03ba835257fdbd2f4b15cd3 100644 (file)
--- 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,6 +114,13 @@ 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:
@@ -134,8 +136,6 @@ slap_init( int mode, const char *name )
 
                ldap_pvt_thread_pool_init( &connection_pool,
                                connection_pool_max, 0);
-
-               ldap_pvt_thread_mutex_init( &entry2str_mutex );
                ldap_pvt_thread_mutex_init( &replog_mutex );
 
                ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
@@ -169,6 +169,8 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
@@ -237,8 +239,6 @@ slap_init( int mode, const char *name )
 
 int slap_startup( Backend *be )
 {
-       int rc;
-
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
@@ -249,8 +249,6 @@ int slap_startup( Backend *be )
 
 int slap_shutdown( Backend *be )
 {
-       int rc;
-
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );