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 0b0fea918173bb59e3a461f9d4a4ed052e54671e..cfd38d77a2db55eb2bf2e3ef101e9b1a99ac1070 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -43,6 +43,7 @@ ldap_pvt_thread_mutex_t       gmtime_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;
@@ -75,13 +76,13 @@ slap_init( int mode, const char *name )
 
        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 ));
+               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;
@@ -93,9 +94,9 @@ slap_init( int mode, const char *name )
                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" ));
+                       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,
@@ -117,6 +118,7 @@ slap_init( int mode, const char *name )
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
+                       ldap_pvt_thread_mutex_init( &ad_mutex );
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
                        ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif
@@ -130,11 +132,11 @@ slap_init( int mode, const char *name )
 
                default:
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "init: %s init, undefined mode (%d).\n", name, mode ));
+                       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;
@@ -149,8 +151,8 @@ int slap_startup( Backend *be )
        int rc;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                   "slap_startup: %s started\n", slap_name ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                  "slap_startup: %s started\n", slap_name ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
@@ -168,8 +170,8 @@ int slap_shutdown( Backend *be )
        int rc;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                   "slap_shutdown: %s shutdown initiated.\n", slap_name));
+       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                  "slap_shutdown: %s shutdown initiated.\n", slap_name));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
@@ -190,9 +192,9 @@ int slap_destroy(void)
        int rc;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                   "slap_destroy: %s freeing system resources.\n",
-                   slap_name ));
+       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",