Allow identical duplicate OID macro definitions. Makes it harmless

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 5ee2f1d934093105e55b04c50e4afbefd8874d67..d504a79228e144e1fa99d4ce46d6970864696f4b 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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,17 @@ 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);
+               root_dse_init();
 
                /* FALLTHRU */
        case SLAP_TOOL_MODE:
@@ -134,7 +135,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 +170,8 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
@@ -236,8 +240,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 );
@@ -248,8 +250,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 );
@@ -271,14 +271,21 @@ int slap_destroy(void)
                ber_bvarray_free( default_referral );
        }
 
+       /* clear out any thread-keys for the main thread */
+       ldap_pvt_thread_pool_context_reset( ldap_pvt_thread_pool_context());
+
        rc = backend_destroy();
 
        slap_sasl_destroy();
 
+       /* rootdse destroy goes before entry_destroy()
+        * because it may use entry_free() */
+       root_dse_destroy();
        entry_destroy();
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+
        case SLAP_TOOL_MODE:
 
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );