import resource cleanup from HEAD

[openldap] / servers / slapd / back-meta / init.c

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 627a26c27bd13e3dabe42940415472ebd675711e..a2349d205b1e3dd17ab0ca3c754f9d7f10dc85aa 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -87,6 +87,8 @@ meta_back_db_init(
         * this may change
         */
        mi->mi_defaulttarget = META_DEFAULT_TARGET_NONE;
+       mi->mi_bind_timeout.tv_sec = 0;
+       mi->mi_bind_timeout.tv_usec = META_BIND_TIMEOUT;
 
        ldap_pvt_thread_mutex_init( &mi->mi_conninfo.lai_mutex );
        ldap_pvt_thread_mutex_init( &mi->mi_cache.mutex );
@@ -148,7 +150,6 @@ meta_back_conn_free(
                (void)meta_clear_one_candidate( &mc->mc_conns[ i ] );
        }
 
-       ldap_pvt_thread_mutex_destroy( &mc->mc_mutex );
        free( mc );
 }
 
@@ -180,6 +181,9 @@ target_free(
        if ( mt->mt_uri ) {
                free( mt->mt_uri );
        }
+       if ( mt->mt_subtree_exclude ) {
+               ber_bvarray_free( mt->mt_subtree_exclude );
+       }
        if ( !BER_BVISNULL( &mt->mt_psuffix ) ) {
                free( mt->mt_psuffix.bv_val );
        }