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 f322956530f935e98f74c24e4dcbd6b9002c0e3d..c9aea2de998878179175ae1d968b7db9cca6c7f7 100644 (file)
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -33,59 +34,44 @@
 
 int
 meta_back_conn_destroy(
-               Backend         *be,
-               Connection      *conn
-)
+       Backend         *be,
+       Connection      *conn )
 {
-       struct metainfo *li = ( struct metainfo * )be->be_private;
-       struct metaconn *lc, lc_curr;
+       metainfo_t      *mi = ( metainfo_t * )be->be_private;
+       metaconn_t      *mc,
+                       mc_curr = { 0 };
+       int             i;
+
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_META, ENTRY,
-               "meta_back_conn_destroy: fetching conn %ld\n", conn->c_connid, 0, 0 );
-#else /* !NEW_LOGGING */
        Debug( LDAP_DEBUG_TRACE,
-               "=>meta_back_conn_destroy: fetching conn %ld\n%s%s",
-               conn->c_connid, "", "" );
-#endif /* !NEW_LOGGING */
+               "=>meta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
+               conn->c_connid,
+               BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
        
-       lc_curr.conn = conn;
+       mc_curr.mc_conn = conn;
+       mc_curr.mc_local_ndn = conn->c_ndn;
        
-       ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-       lc = avl_delete( &li->conntree, ( caddr_t )&lc_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( &li->conn_mutex );
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 
-       if ( lc ) {
-               int i;
-               
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, INFO,
-                       "meta_back_conn_destroy: destroying conn %ld\n",
-                       lc->conn->c_connid, 0, 0 );
-#else /* !NEW_LOGGING */
+       if ( mc ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "=>meta_back_conn_destroy: destroying conn %ld\n%s%s",
-                       lc->conn->c_connid, "", "" );
-#endif /* !NEW_LOGGING */
+                       "=>meta_back_conn_destroy: destroying conn %ld\n",
+                       LDAP_BACK_PCONN_ID( mc->mc_conn ), 0, 0 );
                
-               /*
-                * Cleanup rewrite session
-                */
-               for ( i = 0; i < li->ntargets; ++i ) {
-                       if ( lc->conns[ i ].ld == NULL ) {
-                               continue;
-                       }
+               assert( mc->mc_refcnt == 0 );
 
-                       rewrite_session_delete( li->targets[ i ]->rwmap.rwm_rw, conn );
-                       meta_clear_one_candidate( &lc->conns[ i ], 1 );
-               }
-
-               free( lc->conns );
-               free( lc );
+               meta_back_conn_free( mc );
        }
 
-       /* no response to unbind */
+       /*
+        * Cleanup rewrite session
+        */
+       for ( i = 0; i < mi->mi_ntargets; ++i ) {
+               rewrite_session_delete( mi->mi_targets[ i ].mt_rwmap.rwm_rw, conn );
+       }
 
        return 0;
 }