fix previous commit (ITS#4861)

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 91c699efc719ab54ff0852f6522022d3f22c91fd..9a048b64eb5417f0a0095d7569cee92ae1b55962 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-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,7 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
  */
 ldap_pvt_thread_pool_t connection_pool;
 int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
+int            slap_tool_thread_max = 1;
 #ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t        gmtime_mutex;
 #endif
@@ -92,6 +93,8 @@ slap_init( int mode, const char *name )
        assert( mode );
 
        if ( slapMode != SLAP_UNDEFINED_MODE ) {
+               /* Make sure we write something to stderr */
+               ldap_debug |= 1;
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
                 name, slapMode, mode );
@@ -101,20 +104,39 @@ slap_init( int mode, const char *name )
 
        slapMode = mode;
 
+#ifdef SLAPD_MODULES
+       if ( module_init() != 0 ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: module_init failed\n",
+                       name, 0, 0 );
+               return 1;
+       }
+#endif
+
+       if ( slap_schema_init( ) != 0 ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: slap_schema_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
+
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+
+               /* FALLTHRU */
        case SLAP_TOOL_MODE:
                Debug( LDAP_DEBUG_TRACE,
                        "%s init: initiated %s.\n",     name,
                        (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
                        0 );
 
-
                slap_name = 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 );
 
@@ -149,10 +171,13 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
        default:
+               ldap_debug |= 1;
                Debug( LDAP_DEBUG_ANY,
                        "%s init: undefined mode (%d).\n", name, mode, 0 );
 
@@ -160,6 +185,57 @@ slap_init( int mode, const char *name )
                break;
        }
 
+       if ( slap_controls_init( ) != 0 ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: slap_controls_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
+#ifdef HAVE_TLS
+       /* Library defaults to full certificate checking. This is correct when
+        * a client is verifying a server because all servers should have a
+        * valid cert. But few clients have valid certs, so we want our default
+        * to be no checking. The config file can override this as usual.
+        */
+       rc = 0;
+       (void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
+#endif
+
+       if ( frontend_init() ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: frontend_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
+       if ( overlay_init() ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: overlay_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
+       if ( glue_sub_init() ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: glue/subordinate init failed\n",
+                   name, 0, 0 );
+
+               return 1;
+       }
+
+       if ( acl_init() ) {
+               ldap_debug |= 1;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: acl_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
        return rc;
 }
 
@@ -178,7 +254,7 @@ int slap_startup( Backend *be )
        if( rc == 0 ) {
                Slapi_PBlock *pb = slapi_pblock_new();
 
-               if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+               if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
                        rc = -1;
                }
                slapi_pblock_destroy( pb );
@@ -204,7 +280,7 @@ int slap_shutdown( Backend *be )
 
 #ifdef LDAP_SLAPI
        pb = slapi_pblock_new();
-       (void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+       (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
        slapi_pblock_destroy( pb );
 #endif /* LDAP_SLAPI */
 
@@ -224,6 +300,9 @@ 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();