Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index a8125db10c2b955c03ab1e535122e4d3d9b4cbcd..cfd38d77a2db55eb2bf2e3ef101e9b1a99ac1070 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -38,14 +38,12 @@ char                **g_argv;
 /*
  * global variables that need mutex protection
  */
-int                            active_threads;
-ldap_pvt_thread_mutex_t        active_threads_mutex;
-ldap_pvt_thread_cond_t active_threads_cond;
-
+ldap_pvt_thread_pool_t connection_pool;
 ldap_pvt_thread_mutex_t        gmtime_mutex;
-#ifdef SLAPD_CRYPT
-ldap_pvt_thread_mutex_t        crypt_mutex;
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+ldap_pvt_thread_mutex_t        passwd_mutex;
 #endif
+ldap_pvt_thread_mutex_t ad_mutex;
 
 int                            num_conns;
 long                   num_ops_initiated;
@@ -64,22 +62,29 @@ ldap_pvt_thread_mutex_t     num_sent_mutex;
 ldap_pvt_thread_mutex_t        entry2str_mutex;
 ldap_pvt_thread_mutex_t        replog_mutex;
 
-static char* slap_name = NULL;
+static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
 static ldap_pvt_thread_mutex_t currenttime_mutex;
 
 int
-slap_init( int mode, char *name )
+slap_init( int mode, const char *name )
 {
        int rc;
 
        assert( mode );
 
        if( slapMode != SLAP_UNDEFINED_MODE ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                          "init: %s init called twice (old=%d, new=%d)\n",
+                          name, slapMode, mode ));
+#else
                Debug( LDAP_DEBUG_ANY,
-                "%s init: init called twice (old=%d, new=%d)\n",
-                name, slapMode, mode );
+                "%s init: init called twice (old=%d, new=%d)\n",
+                name, slapMode, mode );
+#endif
+
                return 1;
        }
 
@@ -88,16 +93,23 @@ slap_init( int mode, char *name )
        switch ( slapMode & SLAP_MODE ) {
                case SLAP_SERVER_MODE:
                case SLAP_TOOL_MODE:
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "init: %s initiation, initiated %s.\n",
+                                  name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
-                               "%s init: initiated %s.\n",
-                               name, ( mode & SLAP_TOOL_MODE ) ? "tool" : "server", 0 );
+                               "%s init: initiated %s.\n",     name,
+                               (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
+                               0 );
+#endif
+
 
                        slap_name = name;
        
                        (void) ldap_pvt_thread_initialize();
 
-                       ldap_pvt_thread_mutex_init( &active_threads_mutex );
-                       ldap_pvt_thread_cond_init( &active_threads_cond );
+                       ldap_pvt_thread_pool_init(&connection_pool, SLAP_MAX_WORKER_THREADS, 0);
 
                        ldap_pvt_thread_mutex_init( &currenttime_mutex );
                        ldap_pvt_thread_mutex_init( &entry2str_mutex );
@@ -106,16 +118,27 @@ slap_init( int mode, char *name )
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#ifdef SLAPD_CRYPT
-                       ldap_pvt_thread_mutex_init( &crypt_mutex );
+                       ldap_pvt_thread_mutex_init( &ad_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+                       ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif
 
-                       rc = backend_init( );
+                       rc = slap_sasl_init();
+
+                       if( rc == 0 ) {
+                               rc = backend_init( );
+                       }
                        break;
 
                default:
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "init: %s init, undefined mode (%d).\n", name, mode ));
+#else
                        Debug( LDAP_DEBUG_ANY,
-                               "%s init: undefined mode (%d).\n", name, mode, 0 );
+                               "%s init: undefined mode (%d).\n", name, mode, 0 );
+#endif
+
                        rc = 1;
                        break;
        }
@@ -127,15 +150,17 @@ int slap_startup( Backend *be )
 {
        int rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                  "slap_startup: %s started\n", slap_name ));
+#else
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
+#endif
 
-       rc = backend_startup( be );
 
-       if( rc == 0 ) {
-               rc = sasl_init();
-       }
+       rc = backend_startup( be );
 
        return rc;
 }
@@ -144,11 +169,17 @@ int slap_shutdown( Backend *be )
 {
        int rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                  "slap_shutdown: %s shutdown initiated.\n", slap_name));
+#else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
+#endif
+
 
-       sasl_destroy();
+       slap_sasl_destroy();
 
        /* let backends do whatever cleanup they need to do */
        rc = backend_shutdown( be ); 
@@ -160,9 +191,16 @@ int slap_destroy(void)
 {
        int rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                  "slap_destroy: %s freeing system resources.\n",
+                  slap_name ));
+#else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: freeing system resources.\n",
                slap_name, 0, 0 );
+#endif
+
 
        rc = backend_destroy();