X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b711ef9840610fe7246bae15164966bdbbf86c3a;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=b7a3fc3bac0a9d8e2094767c8c043049dba22550;hpb=761f2879435deec0dc8369de98381557de416b89;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index b7a3fc3bac..b711ef9840 100644
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,9 +68,6 @@ int			connection_pool_max = SLAP_MAX_WORKER_THREADS;
 #ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t	gmtime_mutex;
 #endif
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-ldap_pvt_thread_mutex_t	passwd_mutex;
-#endif
 
 slap_counters_t			slap_counters;
 
@@ -126,8 +123,8 @@ slap_init( int mode, const char *name )
 		ldap_pvt_mp_init( slap_counters.sc_entries );
 		ldap_pvt_mp_init( slap_counters.sc_refs );
 
-		ldap_pvt_mp_init( slap_counters.sc_ops_completed );
 		ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
+		ldap_pvt_mp_init( slap_counters.sc_ops_completed );
 
 #ifdef SLAPD_MONITOR
 		for ( i = 0; i < SLAP_OP_LAST; i++ ) {
@@ -139,9 +136,7 @@ slap_init( int mode, const char *name )
 #ifndef HAVE_GMTIME_R
 		ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #endif
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-		ldap_pvt_thread_mutex_init( &passwd_mutex );
-#endif
+		slap_passwd_init();
 
 		rc = slap_sasl_init();
 
@@ -239,8 +234,8 @@ int slap_destroy(void)
 		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_completed );
 		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++ ) {