X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Funbind.c;h=523657ef240fd7af71e99e17823bb3ad4a1b4a91;hb=bf35f8e37fa2516daa02a8c607dd2326b2be40e9;hp=a0b11f40a498b0f47cb1a39d3f445d50603ba736;hpb=e89d7b1280a1aa0c5bb06d04a82e945c1b181261;p=openldap

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index a0b11f40a4..523657ef24 100644
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,7 +1,7 @@
 /* unbind.c - ldap backend unbind function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -55,9 +55,8 @@ ldap_back_conn_destroy(
 	struct ldapconn *lc, lc_curr;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldap_back_conn_destroy: fetching conn %ld\n",
-			conn->c_connid ));
+	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",
@@ -65,15 +64,22 @@ ldap_back_conn_destroy(
 #endif /* !NEW_LOGGING */
 
 	lc_curr.conn = conn;
+	lc_curr.local_dn = conn->c_ndn;
 	
 	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 */
 		Debug( LDAP_DEBUG_TRACE,
 			"=>ldap_back_conn_destroy: destroying conn %ld\n",
 			lc->conn->c_connid, 0, 0 );
+#endif
 
 #ifdef ENABLE_REWRITE
 		/*
@@ -87,11 +93,7 @@ ldap_back_conn_destroy(
 		 * and calling ldap_unbind on a corrupted header results
 		 * in a segmentation fault
 		 */
-		ldap_unbind(lc->ld);
-		if ( lc->bound_dn.bv_val ) {
-			ch_free( lc->bound_dn.bv_val );
-		}
-		ch_free( lc );
+		ldap_back_conn_free( lc );
 	}
 
 	/* no response to unbind */