fix previous commit

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

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index aa699342b6aa97f41f4dd4514d50bf38146d7316..6cc2c797da04f483bbb2869c571858fa2ddcafcd 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -38,8 +38,8 @@ ldap_back_conn_destroy(
                Connection      *conn
 )
 {
-       struct ldapinfo *li = (struct ldapinfo *) be->be_private;
-       struct ldapconn *lc = NULL, lc_curr;
+       ldapinfo_t      *li = (ldapinfo_t *) be->be_private;
+       ldapconn_t      *lc = NULL, lc_curr;
 
        Debug( LDAP_DEBUG_TRACE,
                "=>ldap_back_conn_destroy: fetching conn %ld\n",
@@ -48,24 +48,14 @@ ldap_back_conn_destroy(
        lc_curr.lc_conn = conn;
        lc_curr.lc_local_ndn = conn->c_ndn;
        
-retry_lock:;
-       switch ( ldap_pvt_thread_mutex_trylock( &li->conn_mutex ) ) {
-       case LDAP_PVT_THREAD_EBUSY:
-       default:
-               ldap_pvt_thread_yield();
-               goto retry_lock;
-
-       case 0:
-               break;
-       }
-
-       lc = avl_delete( &li->conntree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+       lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
        if ( lc ) {
                Debug( LDAP_DEBUG_TRACE,
                        "=>ldap_back_conn_destroy: destroying conn %ld (refcnt=%u)\n",
-                       lc->lc_conn->c_connid, lc->lc_refcnt, 0 );
+                       LDAP_BACK_PCONN_ID( lc->lc_conn ), lc->lc_refcnt, 0 );
 
                assert( lc->lc_refcnt == 0 );