X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Funbind.c;h=d2d416a5691eacb5871f6f57ebd20f6cd87d0b7e;hb=8b954144d612e78da4c8c815007717fc9781cab6;hp=83d5609a42d3b37c65e0e44597a138a1dc34ca54;hpb=c55a82baa24abc4fa63b7dc50de2d3758d69514b;p=openldap

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index 83d5609a42..d2d416a569 100644
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,29 +1,24 @@
 /* unbind.c - ldap backend unbind function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* This is an altered version */
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -43,20 +38,48 @@ ldap_back_conn_destroy(
 )
 {
 	struct ldapinfo	*li = (struct ldapinfo *) be->be_private;
-	struct ldapconn *lc, *lp;
+	struct ldapconn *lc, 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;
+	
 	ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-	for (lc = li->lcs, lp = (struct ldapconn *)&li->lcs; lc;
-		lp=lc, lc=lc->next)
-		if (lc->conn == conn) {
-			lp->next = lc->next;
-			break;
-		}
+	lc = avl_delete( &li->conntree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
 	ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
 	if (lc) {
-		ldap_unbind(lc->ld);
-		free(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 */
+		Debug( LDAP_DEBUG_TRACE,
+			"=>ldap_back_conn_destroy: destroying conn %ld\n",
+			lc->conn->c_connid, 0, 0 );
+#endif
+
+#ifdef ENABLE_REWRITE
+		/*
+		 * Cleanup rewrite session
+		 */
+		rewrite_session_delete( li->rwmap.rwm_rw, conn );
+#endif /* ENABLE_REWRITE */
+
+		/*
+		 * 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 );
 	}
 
 	/* no response to unbind */