Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index cfd38d77a2db55eb2bf2e3ef101e9b1a99ac1070..508650b36b22251f0b4ac29de40dc962790fdd67 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -43,7 +43,6 @@ 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;
@@ -65,8 +64,6 @@ ldap_pvt_thread_mutex_t       replog_mutex;
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
-static ldap_pvt_thread_mutex_t currenttime_mutex;
-
 int
 slap_init( int mode, const char *name )
 {
@@ -111,14 +108,12 @@ slap_init( int mode, const char *name )
 
                        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 );
                        ldap_pvt_thread_mutex_init( &replog_mutex );
                        ldap_pvt_thread_mutex_init( &num_ops_mutex );
                        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
@@ -211,13 +206,3 @@ int slap_destroy(void)
        /* should destory the above mutex */
        return rc;
 }
-
-/* should create a utils.c for these */
-time_t slap_get_time(void)
-{
-       time_t t;
-       ldap_pvt_thread_mutex_lock( &currenttime_mutex );
-       time( &t );
-       ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
-       return t;
-}