test whether the current entry matches the current uri filter (ITS#6077); also, don...

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

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index 180441a44d0d9ea22847227dd65c80131e03c363..6c9d155ad0bd8eb456baf8c531b3f7b28514cad0 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -38,36 +38,41 @@ 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",
                conn->c_connid, 0, 0 );
 
        lc_curr.lc_conn = conn;
-       lc_curr.lc_local_ndn = conn->c_ndn;
        
-       ldap_pvt_thread_mutex_trylock( &li->conn_mutex );
-       lc = avl_delete( &li->conntree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
-
-       if ( lc ) {
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+#if LDAP_BACK_PRINT_CONNTREE > 0
+       ldap_back_print_conntree( li, ">>> ldap_back_conn_destroy" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
+       while ( ( lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)&lc_curr, ldap_back_conn_cmp ) ) != NULL )
+       {
                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_conn_destroy: destroying conn %ld "
+                       "refcnt=%d flags=0x%08x\n",
+                       LDAP_BACK_PCONN_ID( lc ),
+                       lc->lc_refcnt, lc->lc_lcflags );
 
-               assert( lc->lc_refcnt == 0 );
+               if ( lc->lc_refcnt > 0 ) {
+                       /* someone else might be accessing the connection;
+                        * mark for deletion */
+                       LDAP_BACK_CONN_CACHED_CLEAR( lc );
+                       LDAP_BACK_CONN_TAINTED_SET( lc );
 
-               /*
-                * Needs a test because the handler may be corrupted,
-                * and calling ldap_unbind on a corrupted header results
-                * in a segmentation fault
-                */
-               ldap_back_conn_free( lc );
+               } else {
+                       ldap_back_conn_free( lc );
+               }
        }
-
-       /* no response to unbind */
+#if LDAP_BACK_PRINT_CONNTREE > 0
+       ldap_back_print_conntree( li, "<<< ldap_back_conn_destroy" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
        return 0;
 }