X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Funbind.c;h=97f26bc7db9a7c030bb61e07bce609f26887568d;hb=be53e8265065e7de61a0996e37732f44e22fdec7;hp=40350141c9db3570b59056c68b2332c6af269ad3;hpb=5422345e55c0ff5f5d4cf01a5aa3eb47de19eaad;p=openldap

diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c
index 40350141c9..97f26bc7db 100644
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -26,6 +26,7 @@
 
 #include <ac/socket.h>
 #include <ac/string.h>
+#include <ac/errno.h>
 
 #include "slap.h"
 #include "../back-ldap/back-ldap.h"
@@ -33,46 +34,43 @@
 
 int
 meta_back_conn_destroy(
-		Backend		*be,
-		Connection	*conn
-)
+	Backend		*be,
+	Connection	*conn )
 {
-	struct metainfo	*li = ( struct metainfo * )be->be_private;
-	struct metaconn *lc,
-			lc_curr = { 0 };
+	metainfo_t	*mi = ( metainfo_t * )be->be_private;
+	metaconn_t *mc,
+			mc_curr = { 0 };
 
 	Debug( LDAP_DEBUG_TRACE,
 		"=>meta_back_conn_destroy: fetching conn %ld\n",
 		conn->c_connid, 0, 0 );
 	
-	lc_curr.mc_conn = conn;
+	mc_curr.mc_conn = conn;
 	
-	ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-	lc = avl_delete( &li->conntree, ( caddr_t )&lc_curr,
+	ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
+	mc = avl_delete( &mi->mi_conntree, ( caddr_t )&mc_curr,
 			meta_back_conn_cmp );
-	ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+	ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
+
+	if ( mc ) {
+		int	i;
 
-	if ( lc ) {
-		int i;
-		
 		Debug( LDAP_DEBUG_TRACE,
 			"=>meta_back_conn_destroy: destroying conn %ld\n",
-			lc->mc_conn->c_connid, 0, 0 );
+			mc->mc_conn->c_connid, 0, 0 );
 		
 		/*
 		 * Cleanup rewrite session
 		 */
-		for ( i = 0; i < li->ntargets; ++i ) {
-			if ( lc->mc_conns[ i ].msc_ld == NULL ) {
+		for ( i = 0; i < mi->mi_ntargets; ++i ) {
+			if ( mc->mc_conns[ i ].msc_ld == NULL ) {
 				continue;
 			}
 
-			rewrite_session_delete( li->targets[ i ]->mt_rwmap.rwm_rw, conn );
-			meta_clear_one_candidate( &lc->mc_conns[ i ], 1 );
+			rewrite_session_delete( mi->mi_targets[ i ].mt_rwmap.rwm_rw, conn );
+			meta_clear_one_candidate( &mc->mc_conns[ i ] );
 		}
-
-		free( lc->mc_conns );
-		free( lc );
+		meta_back_conn_free( mc );
 	}
 
 	/* no response to unbind */