minor cleanup

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

diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c
index ed4bc96e30e82339f83857ef7ce7e01f22632b0c..c9aea2de998878179175ae1d968b7db9cca6c7f7 100644 (file)
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -44,15 +44,17 @@ meta_back_conn_destroy(
 
 
        Debug( LDAP_DEBUG_TRACE,
-               "=>meta_back_conn_destroy: fetching conn %ld\n",
-               conn->c_connid, 0, 0 );
+               "=>meta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
+               conn->c_connid,
+               BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
        
        mc_curr.mc_conn = conn;
+       mc_curr.mc_local_ndn = conn->c_ndn;
        
-       ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
-       mc = avl_delete( &mi->mi_conntree, ( caddr_t )&mc_curr,
+       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+       mc = avl_delete( &mi->mi_conninfo.lai_tree, ( caddr_t )&mc_curr,
                        meta_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 
        if ( mc ) {
                Debug( LDAP_DEBUG_TRACE,
@@ -61,12 +63,6 @@ meta_back_conn_destroy(
                
                assert( mc->mc_refcnt == 0 );
 
-               for ( i = 0; i < mi->mi_ntargets; ++i ) {
-                       if ( mc->mc_conns[ i ].msc_ld != NULL ) {
-                               meta_clear_one_candidate( &mc->mc_conns[ i ] );
-                       }
-               }
-
                meta_back_conn_free( mc );
        }