Fix prev commit, renaming schema

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 6a68e498eec835b3128163c3f5bb387582ebcedc..f92590872c214da1c03ba835257fdbd2f4b15cd3 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,6 @@
 
 #include "slap.h"
 #include "lber_pvt.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
 
 #include "ldap_rq.h"
 
@@ -74,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;
@@ -94,7 +86,7 @@ slap_init( int mode, const char *name )
 
        if ( slapMode != SLAP_UNDEFINED_MODE ) {
                /* Make sure we write something to stderr */
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
                 name, slapMode, mode );
@@ -106,7 +98,7 @@ slap_init( int mode, const char *name )
 
 #ifdef SLAPD_MODULES
        if ( module_init() != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: module_init failed\n",
                        name, 0, 0 );
@@ -115,13 +107,20 @@ slap_init( int mode, const char *name )
 #endif
 
        if ( slap_schema_init( ) != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: slap_schema_init failed\n",
                    name, 0, 0 );
                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:
@@ -137,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 );
@@ -172,11 +169,13 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
        default:
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                        "%s init: undefined mode (%d).\n", name, mode, 0 );
 
@@ -185,7 +184,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( slap_controls_init( ) != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: slap_controls_init failed\n",
                    name, 0, 0 );
@@ -203,7 +202,7 @@ slap_init( int mode, const char *name )
 #endif
 
        if ( frontend_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: frontend_init failed\n",
                    name, 0, 0 );
@@ -211,7 +210,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( overlay_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: overlay_init failed\n",
                    name, 0, 0 );
@@ -219,7 +218,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( glue_sub_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: glue/subordinate init failed\n",
                    name, 0, 0 );
@@ -228,7 +227,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( acl_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: acl_init failed\n",
                    name, 0, 0 );
@@ -240,50 +239,22 @@ 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 );
 
 
-       rc = backend_startup( be );
-
-#ifdef LDAP_SLAPI
-       if( rc == 0 ) {
-               Slapi_PBlock *pb = slapi_pblock_new();
-
-               if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
-                       rc = -1;
-               }
-               slapi_pblock_destroy( pb );
-       }
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_startup( be );
 }
 
 int slap_shutdown( Backend *be )
 {
-       int rc;
-#ifdef LDAP_SLAPI
-       Slapi_PBlock *pb;
-#endif
-
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
 
        /* let backends do whatever cleanup they need to do */
-       rc = backend_shutdown( be ); 
-
-#ifdef LDAP_SLAPI
-       pb = slapi_pblock_new();
-       (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
-       slapi_pblock_destroy( pb );
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_shutdown( be ); 
 }
 
 int slap_destroy(void)