Add pointer to an existing document since the netscape.com URLs are dead.

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index a69cefe73ce73c6e7b9541a0b0fc6aebee92f749..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
@@ -124,6 +124,7 @@ slap_init( int mode, const char *name )
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+               root_dse_init();
 
                /* FALLTHRU */
        case SLAP_TOOL_MODE:
@@ -169,6 +170,8 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
@@ -268,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 );