X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Funbind.c;h=6c9d155ad0bd8eb456baf8c531b3f7b28514cad0;hb=e9f1452624c7fc828d45ebc1f3cc6fcdf03991db;hp=d2d416a5691eacb5871f6f57ebd20f6cd87d0b7e;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index d2d416a569..6c9d155ad0 100644
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -33,56 +34,45 @@
 
 int
 ldap_back_conn_destroy(
-    Backend		*be,
-    Connection		*conn
+		Backend		*be,
+		Connection	*conn
 )
 {
-	struct ldapinfo	*li = (struct ldapinfo *) be->be_private;
-	struct ldapconn *lc, lc_curr;
+	ldapinfo_t	*li = (ldapinfo_t *) be->be_private;
+	ldapconn_t	*lc = NULL, lc_curr;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG( BACK_LDAP, INFO,
-		"ldap_back_conn_destroy: fetching conn %ld\n", conn->c_connid, 0, 0 );
-#else /* !NEW_LOGGING */
 	Debug( LDAP_DEBUG_TRACE,
 		"=>ldap_back_conn_destroy: fetching conn %ld\n",
 		conn->c_connid, 0, 0 );
-#endif /* !NEW_LOGGING */
 
-	lc_curr.conn = conn;
-	lc_curr.local_dn = conn->c_ndn;
+	lc_curr.lc_conn = conn;
 	
-	ldap_pvt_thread_mutex_lock( &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) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( BACK_LDAP, DETAIL1, 
-			"ldap_back_conn_destroy: destroying conn %ld\n", 
-			conn->c_connid, 0, 0 );
-#else /* !NEW_LOGGING */
+	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\n",
-			lc->conn->c_connid, 0, 0 );
-#endif
+			"=>ldap_back_conn_destroy: destroying conn %ld "
+			"refcnt=%d flags=0x%08x\n",
+			LDAP_BACK_PCONN_ID( lc ),
+			lc->lc_refcnt, lc->lc_lcflags );
 
-#ifdef ENABLE_REWRITE
-		/*
-		 * Cleanup rewrite session
-		 */
-		rewrite_session_delete( li->rwmap.rwm_rw, conn );
-#endif /* ENABLE_REWRITE */
+		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;
 }