]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/init.c
Fix compare op
[openldap] / servers / slapd / init.c
index 6b4589730810492f39cd09979ae97816f7482bd6..ae15d0515a099ef5b145cbec94f6adf9d428017a 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2009 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"
 
@@ -58,27 +55,15 @@ int         ldap_syslog_level = LOG_DEBUG;
 
 BerVarray default_referral = NULL;
 
-struct berval AllUser = BER_BVC( LDAP_ALL_USER_ATTRIBUTES );
-struct berval AllOper = BER_BVC( LDAP_ALL_OPERATIONAL_ATTRIBUTES );
-struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
-
 /*
  * global variables that need mutex protection
  */
 ldap_pvt_thread_pool_t connection_pool;
 int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
-#ifndef HAVE_GMTIME_R
+int            slap_tool_thread_max = 1;
 ldap_pvt_thread_mutex_t        gmtime_mutex;
-#endif
 
-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;
+slap_counters_t                        slap_counters, *slap_counters_list;
 
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
@@ -87,13 +72,12 @@ int
 slap_init( int mode, const char *name )
 {
        int rc;
-       int i;
 
        assert( mode );
 
        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 );
@@ -103,9 +87,11 @@ slap_init( int mode, const char *name )
 
        slapMode = mode;
 
+       slap_op_init();
+
 #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 );
@@ -114,18 +100,32 @@ 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 ( filter_init() != 0 ) {
+               slap_debug |= LDAP_DEBUG_NONE;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: filter_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:
-               ldap_pvt_thread_pool_init( &connection_pool,
-                               connection_pool_max, 0);
+               root_dse_init();
 
                /* FALLTHRU */
        case SLAP_TOOL_MODE:
@@ -136,33 +136,16 @@ slap_init( int mode, const char *name )
 
                slap_name = name;
 
-               ldap_pvt_thread_mutex_init( &entry2str_mutex );
-               ldap_pvt_thread_mutex_init( &replog_mutex );
-
-               ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
-               ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
-               ldap_pvt_mp_init( slap_counters.sc_bytes );
-               ldap_pvt_mp_init( slap_counters.sc_pdu );
-               ldap_pvt_mp_init( slap_counters.sc_entries );
-               ldap_pvt_mp_init( slap_counters.sc_refs );
+               ldap_pvt_thread_pool_init( &connection_pool,
+                               connection_pool_max, 0);
 
-               ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
-               ldap_pvt_mp_init( slap_counters.sc_ops_completed );
+               slap_counters_init( &slap_counters );
 
                ldap_pvt_thread_mutex_init( &slapd_rq.rq_mutex );
                LDAP_STAILQ_INIT( &slapd_rq.task_list );
                LDAP_STAILQ_INIT( &slapd_rq.run_list );
 
-#ifdef SLAPD_MONITOR
-               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
-                       ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
-               }
-#endif /* SLAPD_MONITOR */
-
-#ifndef HAVE_GMTIME_R
                ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#endif
                slap_passwd_init();
 
                rc = slap_sasl_init();
@@ -170,11 +153,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 );
 
@@ -183,25 +168,15 @@ 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 );
                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;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: frontend_init failed\n",
                    name, 0, 0 );
@@ -209,15 +184,24 @@ 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 );
                return 1;
        }
 
+       if ( glue_sub_init() ) {
+               slap_debug |= LDAP_DEBUG_NONE;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: glue/subordinate init failed\n",
+                   name, 0, 0 );
+
+               return 1;
+       }
+
        if ( acl_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: acl_init failed\n",
                    name, 0, 0 );
@@ -229,56 +213,27 @@ 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)
 {
        int rc;
-       int i;
 
        Debug( LDAP_DEBUG_TRACE,
                "%s destroy: freeing system resources.\n",
@@ -288,31 +243,22 @@ 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 );
-               ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
-               ldap_pvt_mp_clear( slap_counters.sc_bytes );
-               ldap_pvt_mp_clear( slap_counters.sc_pdu );
-               ldap_pvt_mp_clear( slap_counters.sc_entries );
-               ldap_pvt_mp_clear( slap_counters.sc_refs );
-               ldap_pvt_mp_clear( slap_counters.sc_ops_initiated );
-               ldap_pvt_mp_clear( slap_counters.sc_ops_completed );
-
-#ifdef SLAPD_MONITOR
-               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       ldap_pvt_mp_clear( slap_counters.sc_ops_initiated_[ i ] );
-                       ldap_pvt_mp_clear( slap_counters.sc_ops_completed_[ i ] );
-               }
-#endif /* SLAPD_MONITOR */
+               slap_counters_destroy( &slap_counters );
                break;
 
        default:
@@ -324,8 +270,53 @@ int slap_destroy(void)
 
        }
 
+       slap_op_destroy();
+
        ldap_pvt_thread_destroy();
 
-       /* should destory the above mutex */
+       /* should destroy the above mutex */
        return rc;
 }
+
+void slap_counters_init( slap_counters_t *sc )
+{
+       int i;
+
+       ldap_pvt_thread_mutex_init( &sc->sc_mutex );
+       ldap_pvt_mp_init( sc->sc_bytes );
+       ldap_pvt_mp_init( sc->sc_pdu );
+       ldap_pvt_mp_init( sc->sc_entries );
+       ldap_pvt_mp_init( sc->sc_refs );
+
+       ldap_pvt_mp_init( sc->sc_ops_initiated );
+       ldap_pvt_mp_init( sc->sc_ops_completed );
+
+#ifdef SLAPD_MONITOR
+       for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+               ldap_pvt_mp_init( sc->sc_ops_initiated_[ i ] );
+               ldap_pvt_mp_init( sc->sc_ops_completed_[ i ] );
+       }
+#endif /* SLAPD_MONITOR */
+}
+
+void slap_counters_destroy( slap_counters_t *sc )
+{
+       int i;
+
+       ldap_pvt_thread_mutex_destroy( &sc->sc_mutex );
+       ldap_pvt_mp_clear( sc->sc_bytes );
+       ldap_pvt_mp_clear( sc->sc_pdu );
+       ldap_pvt_mp_clear( sc->sc_entries );
+       ldap_pvt_mp_clear( sc->sc_refs );
+
+       ldap_pvt_mp_clear( sc->sc_ops_initiated );
+       ldap_pvt_mp_clear( sc->sc_ops_completed );
+
+#ifdef SLAPD_MONITOR
+       for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+               ldap_pvt_mp_clear( sc->sc_ops_initiated_[ i ] );
+               ldap_pvt_mp_clear( sc->sc_ops_completed_[ i ] );
+       }
+#endif /* SLAPD_MONITOR */
+}
+