X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fbind.c;h=120959699f61ca10732d2c937179a78931d39bee;hb=be53e8265065e7de61a0996e37732f44e22fdec7;hp=11093f2e6b070ba2a955d5e5431586faf17066b1;hpb=c1b5e84e2db2d754a9f0ebd26d607744cabe5fb6;p=openldap

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 11093f2e6b..120959699f 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -36,23 +36,22 @@
 static LDAP_REBIND_PROC	meta_back_rebind;
 
 static int
-meta_back_do_single_bind(
-		struct metaconn		*lc,
-		Operation		*op,
-		SlapReply		*rs,
-		int			candidate
-);
+meta_back_single_bind(
+	Operation		*op,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	int			candidate );
 
 int
 meta_back_bind( Operation *op, SlapReply *rs )
 {
-	struct metainfo	*li = ( struct metainfo * )op->o_bd->be_private;
-	struct metaconn *lc;
+	metainfo_t	*mi = ( metainfo_t * )op->o_bd->be_private;
+	metaconn_t	*mc;
 
 	int		rc = LDAP_OTHER,
-			i, gotit = 0, ndnlen, isroot = 0;
+			i, gotit = 0, isroot = 0;
 
-	char		*candidates = meta_back_candidates_get( op );
+	SlapReply	*candidates = meta_back_candidates_get( op );
 
 	rs->sr_err = LDAP_SUCCESS;
 
@@ -67,8 +66,8 @@ meta_back_bind( Operation *op, SlapReply *rs )
 	/* we need meta_back_getconn() not send result even on error,
 	 * because we want to intercept the error and make it
 	 * invalidCredentials */
-	lc = meta_back_getconn( op, rs, NULL, LDAP_BACK_DONTSEND );
-	if ( !lc ) {
+	mc = meta_back_getconn( op, rs, NULL, LDAP_BACK_DONTSEND );
+	if ( !mc ) {
 		Debug( LDAP_DEBUG_ANY,
 				"meta_back_bind: no target "
 				"for dn \"%s\" (%d: %s).\n",
@@ -90,20 +89,15 @@ meta_back_bind( Operation *op, SlapReply *rs )
 	/*
 	 * Each target is scanned ...
 	 */
-	lc->mc_bound_target = META_BOUND_NONE;
-	ndnlen = op->o_req_ndn.bv_len;
-	for ( i = 0; i < li->mi_ntargets; i++ ) {
+	mc->mc_auth_target = META_BOUND_NONE;
+	for ( i = 0; i < mi->mi_ntargets; i++ ) {
 		int		lerr;
-		struct berval	orig_dn = op->o_req_dn;
-		struct berval	orig_ndn = op->o_req_ndn;
-		struct berval	orig_cred = op->orb_cred;
-		int		orig_method = op->orb_method;
-		
+		Operation	op2 = *op;
 
 		/*
 		 * Skip non-candidates
 		 */
-		if ( candidates[ i ] != META_CANDIDATE ) {
+		if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
 			continue;
 		}
 
@@ -121,34 +115,26 @@ meta_back_bind( Operation *op, SlapReply *rs )
 					0, 0, 0 );
 		}
 
-		if ( isroot && !BER_BVISNULL( &li->mi_targets[ i ]->mt_pseudorootdn ) )
+		if ( isroot && !BER_BVISNULL( &mi->mi_targets[ i ].mt_pseudorootdn ) )
 		{
-			op->o_req_dn = li->mi_targets[ i ]->mt_pseudorootdn;
-			op->o_req_ndn = li->mi_targets[ i ]->mt_pseudorootdn;
-			op->orb_cred = li->mi_targets[ i ]->mt_pseudorootpw;
-			op->orb_method = LDAP_AUTH_SIMPLE;
+			op2.o_req_dn = mi->mi_targets[ i ].mt_pseudorootdn;
+			op2.o_req_ndn = mi->mi_targets[ i ].mt_pseudorootdn;
+			op2.orb_cred = mi->mi_targets[ i ].mt_pseudorootpw;
+			op2.orb_method = LDAP_AUTH_SIMPLE;
 		}
 		
-		lerr = meta_back_do_single_bind( lc, op, rs, i );
+		lerr = meta_back_single_bind( &op2, rs, mc, i );
 		if ( lerr != LDAP_SUCCESS ) {
 			rs->sr_err = lerr;
-			candidates[ i ] = META_NOT_CANDIDATE;
-#if 0
-			( void )meta_clear_one_candidate( &lc->mc_conns[ i ] );
-#endif
+			candidates[ i ].sr_tag = META_NOT_CANDIDATE;
 
 		} else {
 			rc = LDAP_SUCCESS;
 		}
-
-		op->o_req_dn = orig_dn;
-		op->o_req_ndn = orig_ndn;
-		op->orb_cred = orig_cred;
-		op->orb_method = orig_method;
 	}
 
 	if ( isroot ) {
-		lc->mc_bound_target = META_BOUND_ALL;
+		mc->mc_auth_target = META_BOUND_ALL;
 	}
 
 	/*
@@ -179,28 +165,29 @@ meta_back_bind( Operation *op, SlapReply *rs )
 }
 
 /*
- * meta_back_do_single_bind
+ * meta_back_single_bind
  *
  * attempts to perform a bind with creds
  */
 static int
-meta_back_do_single_bind(
-		struct metaconn		*lc,
-		Operation		*op,
-		SlapReply		*rs,
-		int			candidate
-)
+meta_back_single_bind(
+	Operation		*op,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	int			candidate )
 {
-	struct metainfo		*li = ( struct metainfo * )op->o_bd->be_private;
+	metainfo_t		*mi = ( metainfo_t * )op->o_bd->be_private;
+	metatarget_t		*mt = &mi->mi_targets[ candidate ];
 	struct berval		mdn = BER_BVNULL;
 	dncookie		dc;
-	struct metasingleconn	*lsc = &lc->mc_conns[ candidate ];
-	int			msgid;
+	metasingleconn_t	*msc = &mc->mc_conns[ candidate ];
+	int			msgid,
+				rebinding = 0;
 	
 	/*
 	 * Rewrite the bind dn if needed
 	 */
-	dc.rwmap = &li->mi_targets[ candidate ]->mt_rwmap;
+	dc.target = &mi->mi_targets[ candidate ];
 	dc.conn = op->o_conn;
 	dc.rs = rs;
 	dc.ctx = "bindDN";
@@ -215,37 +202,80 @@ meta_back_do_single_bind(
 	 * and more in case of failure ... */
 	/* FIXME: should be check if at least some of the op->o_ctrls
 	 * can/should be passed? */
-	rs->sr_err = ldap_sasl_bind( lsc->msc_ld, mdn.bv_val,
+rebind:;
+	rs->sr_err = ldap_sasl_bind( msc->msc_ld, mdn.bv_val,
 			LDAP_SASL_SIMPLE, &op->orb_cred,
 			op->o_ctrls, NULL, &msgid );
 	if ( rs->sr_err == LDAP_SUCCESS ) {
 		LDAPMessage	*res;
-		struct timeval	tv = { 0, 0 };
+		struct timeval	tv;
 		int		rc;
-		int		nretries = 0;
+		int		nretries = mt->mt_nretries;
 
 		/*
 		 * handle response!!!
 		 */
 retry:;
-		switch ( ldap_result( lsc->msc_ld, msgid, 0, &tv, &res ) ) {
+		tv.tv_sec = 0;
+		tv.tv_usec = META_BIND_TIMEOUT;
+		switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
 		case 0:
-			if ( ++nretries <= META_BIND_NRETRIES ) {
+			Debug( LDAP_DEBUG_ANY, "%s meta_back_single_bind: ldap_result=%d nretries=%d\n",
+				op->o_log_prefix, 0, nretries );
+
+			if ( nretries != META_RETRY_NEVER ) {
 				ldap_pvt_thread_yield();
-				tv.tv_sec = 0;
-				tv.tv_usec = META_BIND_TIMEOUT;
+				if ( nretries > 0 ) {
+					nretries--;
+				}
 				goto retry;
 			}
 			rs->sr_err = LDAP_BUSY;
-			break;
+			if ( rebinding ) {
+				ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
+				break;
+			}
+
+			/* FIXME: some times the request times out
+			 * while the other party is not willing to
+			 * send a response any more.  Give it a second
+			 * chance with a freshly bound connection */
+			rebinding = 1;
+			nretries = mt->mt_nretries;
+			/* fallthru */
 
 		case -1:
-			ldap_get_option( lsc->msc_ld, LDAP_OPT_ERROR_NUMBER,
+			ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER,
 					&rs->sr_err );
+
+			if ( rebinding ) {
+				ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
+			}
+
+			Debug( LDAP_DEBUG_ANY, "### %s meta_back_single_bind: err=%d nretries=%d\n",
+				op->o_log_prefix, rs->sr_err, nretries );
+
+			rc = slap_map_api2result( rs );
+			if ( rs->sr_err == LDAP_UNAVAILABLE && nretries != META_RETRY_NEVER ) {
+				ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
+				msc->msc_ld = NULL;
+			        msc->msc_bound = 0;
+
+			        /* mc here must be the regular mc, reset and ready for init */
+			        rc = meta_back_init_one_conn( op, rs, mt, msc,
+						LDAP_BACK_DONTSEND );
+				if ( rc ) {
+					if ( nretries > 0 ) {
+						nretries--;
+					}
+					ldap_pvt_thread_yield();
+					goto rebind;
+				}
+			}
 			break;
 
 		default:
-			rc = ldap_parse_result( lsc->msc_ld, res, &rs->sr_err,
+			rc = ldap_parse_result( msc->msc_ld, res, &rs->sr_err,
 					NULL, NULL, NULL, NULL, 1 );
 			if ( rc != LDAP_SUCCESS ) {
 				rs->sr_err = rc;
@@ -259,31 +289,23 @@ retry:;
 		goto return_results;
 	}
 
-	if ( !BER_BVISNULL( &lsc->msc_bound_ndn ) ) {
-		ber_memfree( lsc->msc_bound_ndn.bv_val );
-	}
-	ber_dupbv( &lsc->msc_bound_ndn, &op->o_req_dn );
-	lsc->msc_bound = META_BOUND;
-	lc->mc_bound_target = candidate;
-
-	if ( LDAP_BACK_SAVECRED( li ) ) {
-		if ( !BER_BVISNULL( &lsc->msc_cred ) ) {
-			/* destroy sensitive data */
-			memset( lsc->msc_cred.bv_val, 0, lsc->msc_cred.bv_len );
-			ber_memfree( lsc->msc_cred.bv_val );
-		}
-		ber_dupbv( &lsc->msc_cred, &op->orb_cred );
-		ldap_set_rebind_proc( lsc->msc_ld, meta_back_rebind, lsc );
+	ber_bvreplace( &msc->msc_bound_ndn, &op->o_req_dn );
+	msc->msc_bound = META_BOUND;
+	mc->mc_auth_target = candidate;
+
+	if ( LDAP_BACK_SAVECRED( mi ) ) {
+		ber_bvreplace( &msc->msc_cred, &op->orb_cred );
+		ldap_set_rebind_proc( msc->msc_ld, meta_back_rebind, msc );
 	}
 
-	if ( li->mi_cache.ttl != META_DNCACHE_DISABLED
-			&& op->o_req_ndn.bv_len != 0 ) {
-		( void )meta_dncache_update_entry( &li->mi_cache,
+	if ( mi->mi_cache.ttl != META_DNCACHE_DISABLED
+			&& op->o_req_ndn.bv_len != 0 )
+	{
+		( void )meta_dncache_update_entry( &mi->mi_cache,
 				&op->o_req_ndn, candidate );
 	}
 
 return_results:;
-	
 	if ( mdn.bv_val != op->o_req_dn.bv_val ) {
 		free( mdn.bv_val );
 	}
@@ -291,110 +313,201 @@ return_results:;
 	return rs->sr_err;
 }
 
+/*
+ * meta_back_single_dobind
+ */
+int
+meta_back_single_dobind(
+	Operation		*op,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	int			candidate,
+	ldap_back_send_t	sendok,
+	int			nretries )
+{
+	metainfo_t		*mi = ( metainfo_t * )op->o_bd->be_private;
+	metatarget_t		*mt = &mi->mi_targets[ candidate ];
+	metasingleconn_t	*msc = &mc->mc_conns[ candidate ];
+	int			rc;
+	struct berval		cred = BER_BVC( "" );
+	int			msgid,
+				rebinding = 0,
+				save_nretries = nretries;
+
+	/*
+	 * Otherwise an anonymous bind is performed
+	 * (note: if the target was already bound, the anonymous
+	 * bind clears the previous bind).
+	 */
+	if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
+		ber_memfree( msc->msc_bound_ndn.bv_val );
+		BER_BVZERO( &msc->msc_bound_ndn );
+	}
+		
+	if ( !BER_BVISNULL( &msc->msc_cred ) ) {
+		/* destroy sensitive data */
+		memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
+		ber_memfree( msc->msc_cred.bv_val );
+		BER_BVZERO( &msc->msc_cred );
+	}
+
+	/* FIXME: should we check if at least some of the op->o_ctrls
+	 * can/should be passed? */
+rebind:;
+	rc = ldap_sasl_bind( msc->msc_ld, "", LDAP_SASL_SIMPLE, &cred,
+			NULL, NULL, &msgid );
+	if ( rc == LDAP_SUCCESS ) {
+		LDAPMessage	*res;
+		struct timeval	tv;
+
+		/*
+		 * handle response!!!
+		 */
+retry:;
+		tv.tv_sec = 0;
+		tv.tv_usec = META_BIND_TIMEOUT;
+		switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
+		case 0:
+			Debug( LDAP_DEBUG_ANY, "%s meta_back_single_dobind: ldap_result=%d nretries=%d\n",
+				op->o_log_prefix, 0, nretries );
+
+			if ( nretries != META_RETRY_NEVER ) {
+				ldap_pvt_thread_yield();
+				if ( nretries > 0 ) {
+					nretries--;
+				}
+				goto retry;
+			}
+
+			rc = LDAP_BUSY;
+			if ( rebinding ) {
+				ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
+				break;
+			}
+
+			/* FIXME: some times the request times out
+			 * while the other party is not willing to
+			 * send a response any more.  Give it a second
+			 * chance with a freshly bound connection */
+			rebinding = 1;
+			nretries = save_nretries;
+			/* fallthru */
+
+		case -1:
+			ldap_get_option( msc->msc_ld,
+					LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
+
+			if ( rebinding ) {
+				ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
+			}
+
+			Debug( LDAP_DEBUG_ANY, "### %s meta_back_single_dobind: err=%d nretries=%d\n",
+					op->o_log_prefix, rs->sr_err, nretries );
+
+			rc = slap_map_api2result( rs );
+			if ( rc == LDAP_UNAVAILABLE && nretries != META_RETRY_NEVER ) {
+				ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
+				msc->msc_ld = NULL;
+			        msc->msc_bound = 0;
+
+			        /* mc here must be the regular mc, reset and ready for init */
+			        rc = meta_back_init_one_conn( op, rs, mt, msc, LDAP_BACK_DONTSEND );
+
+				if ( rc == LDAP_SUCCESS ) {
+					ldap_pvt_thread_yield();
+					if ( nretries > 0 ) {
+						nretries--;
+					}
+					goto rebind;
+				}
+			}
+			break;
+
+		default:
+			rc = ldap_parse_result( msc->msc_ld, res, &rs->sr_err,
+					NULL, NULL, NULL, NULL, 1 );
+			if ( rc == LDAP_SUCCESS ) {
+				rc = slap_map_api2result( rs );
+			}
+			break;
+		}
+
+	} else {
+		rc = slap_map_api2result( rs );
+	}
+
+	rs->sr_err = rc;
+	if ( rc != LDAP_SUCCESS && ( sendok & LDAP_BACK_SENDERR ) ) {
+		send_ldap_result( op, rs );
+	}
+
+	return rc;
+}
+
 /*
  * meta_back_dobind
  */
 int
-meta_back_dobind( struct metaconn *lc, Operation *op, ldap_back_send_t sendok )
+meta_back_dobind(
+	Operation		*op,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	ldap_back_send_t	sendok )
 {
-	struct metasingleconn	*lsc;
+	metainfo_t		*mi = ( metainfo_t * )op->o_bd->be_private;
+
 	int			bound = 0, i;
 
-	char		*candidates = meta_back_candidates_get( op );
+	SlapReply		*candidates = meta_back_candidates_get( op );
+
+	ldap_pvt_thread_mutex_lock( &mc->mc_mutex );
+
+	Debug( LDAP_DEBUG_TRACE,
+		"%s meta_back_dobind: conn=%ld\n",
+		op->o_log_prefix, mc->mc_conn->c_connid, 0 );
 
 	/*
 	 * all the targets are bound as pseudoroot
 	 */
-	if ( lc->mc_bound_target == META_BOUND_ALL ) {
-		return 1;
+	if ( mc->mc_auth_target == META_BOUND_ALL ) {
+		bound = 1;
+		goto done;
 	}
 
-	for ( i = 0, lsc = lc->mc_conns; !META_LAST( lsc ); ++i, ++lsc ) {
-		int		rc;
-		struct berval	cred = BER_BVC("");
-		int		msgid;
+	for ( i = 0; i < mi->mi_ntargets; i++ ) {
+		metatarget_t		*mt = &mi->mi_targets[ i ];
+		metasingleconn_t	*msc = &mc->mc_conns[ i ];
+		int			rc;
 
 		/*
-		 * Not a candidate or something wrong with this target ...
+		 * Not a candidate
 		 */
-		if ( lsc->msc_ld == NULL ) {
+		if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
 			continue;
 		}
 
+		assert( msc->msc_ld != NULL );
+
 		/*
 		 * If the target is already bound it is skipped
 		 */
-		if ( lsc->msc_bound == META_BOUND && lc->mc_bound_target == i ) {
+		if ( msc->msc_bound == META_BOUND && mc->mc_auth_target == i ) {
 			++bound;
-			continue;
-		}
-
-		/*
-		 * Otherwise an anonymous bind is performed
-		 * (note: if the target was already bound, the anonymous
-		 * bind clears the previous bind).
-		 */
-		if ( !BER_BVISNULL( &lsc->msc_bound_ndn ) ) {
-			ber_memfree( lsc->msc_bound_ndn.bv_val );
-			BER_BVZERO( &lsc->msc_bound_ndn );
-		}
-		
-		if ( /* FIXME: need li ... li->savecred && */ 
-				!BER_BVISNULL( &lsc->msc_cred ) )
-		{
-			/* destroy sensitive data */
-			memset( lsc->msc_cred.bv_val, 0, lsc->msc_cred.bv_len );
-			ber_memfree( lsc->msc_cred.bv_val );
-			BER_BVZERO( &lsc->msc_cred );
-		}
-
-		/* FIXME: should we check if at least some of the op->o_ctrls
-		 * can/should be passed? */
-		rc = ldap_sasl_bind( lsc->msc_ld, "", LDAP_SASL_SIMPLE, &cred,
-				NULL, NULL, &msgid );
-		if ( rc == LDAP_SUCCESS ) {
-			LDAPMessage	*res;
-			struct timeval	tv = { 0, 0 };
-			int		err;
-			int		nretries = 0;
-
-			/*
-			 * handle response!!!
-			 */
-retry:;
-			switch ( ldap_result( lsc->msc_ld, msgid, 0, &tv, &res ) ) {
-			case 0:
-				if ( ++nretries <= META_BIND_NRETRIES ) {
-					ldap_pvt_thread_yield();
-					tv.tv_sec = 0;
-					tv.tv_usec = META_BIND_TIMEOUT;
-					goto retry;
-				}
-
-				rc = LDAP_BUSY;
-				break;
-
-			case -1:
-				ldap_get_option( lsc->msc_ld, LDAP_OPT_ERROR_NUMBER,
-						&rc );
-				break;
 
-			default:
-				rc = ldap_parse_result( lsc->msc_ld, res, &err,
-						NULL, NULL, NULL, NULL, 1 );
-				if ( rc == LDAP_SUCCESS ) {
-					rc = err;
-				}
-				break;
-			}
+			Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
+					"authcTarget\n",
+					op->o_log_prefix, i, 0 );
+			continue;
 		}
 
+		rc = meta_back_single_dobind( op, rs, mc, i,
+				LDAP_BACK_DONTSEND, mt->mt_nretries );
 		if ( rc != LDAP_SUCCESS ) {
-			Debug( LDAP_DEBUG_ANY,
-					"==>meta_back_dobind: (anonymous)"
-					" bind failed"
-					" with error %d (%s)\n",
-					rc, ldap_err2string( rc ), 0 );
+			rs->sr_err = slap_map_api2result( rs );
+
+			Debug( LDAP_DEBUG_ANY, "%s meta_back_dobind[%d]: "
+					"(anonymous) err=%d\n",
+					op->o_log_prefix, i, rc );
 
 			/*
 			 * null cred bind should always succeed
@@ -403,43 +516,33 @@ retry:;
 			 * due to technical reasons (remote host down?)
 			 * so better clear the handle
 			 */
-			candidates[ i ] = META_NOT_CANDIDATE;
-#if 0
-			( void )meta_clear_one_candidate( lsc );
-#endif
+			candidates[ i ].sr_tag = META_NOT_CANDIDATE;
 			continue;
 		} /* else */
 		
-		lsc->msc_bound = META_ANONYMOUS;
+		Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
+				"(anonymous)\n",
+				op->o_log_prefix, i, 0 );
+
+		msc->msc_bound = META_ANONYMOUS;
 		++bound;
 	}
 
-	return( bound > 0 );
-}
-
-/*
- *
- */
-int
-meta_back_is_valid( struct metaconn *lc, int candidate )
-{
-	struct metasingleconn 	*lsc;
-	int			i;
+done:;
+        ldap_pvt_thread_mutex_unlock( &mc->mc_mutex );
 
-	assert( lc );
+	Debug( LDAP_DEBUG_TRACE,
+		"%s meta_back_dobind: conn=%ld bound=%d\n",
+		op->o_log_prefix, mc->mc_conn->c_connid, bound );
 
-	if ( candidate < 0 ) {
-		return 0;
-	}
-
-	for ( i = 0, lsc = lc->mc_conns; !META_LAST( lsc ) && i < candidate; 
-			++i, ++lsc );
-	
-	if ( !META_LAST( lsc ) ) {
-		return ( lsc->msc_ld != NULL );
+	if ( bound == 0 && ( sendok & LDAP_BACK_SENDERR ) ) {
+		if ( rs->sr_err == LDAP_SUCCESS ) {
+			rs->sr_err = LDAP_BUSY;
+		}
+		send_ldap_result( op, rs );
 	}
 
-	return 0;
+	return( bound > 0 );
 }
 
 /*
@@ -449,13 +552,17 @@ meta_back_is_valid( struct metaconn *lc, int candidate )
  * credentials as the original user on this session.
  */
 static int 
-meta_back_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
-	ber_int_t msgid, void *params )
+meta_back_rebind(
+	LDAP			*ld,
+	LDAP_CONST char		*url,
+	ber_tag_t		request,
+	ber_int_t		msgid,
+	void			*params )
 {
-	struct metasingleconn	*lsc = params;
+	metasingleconn_t	*msc = ( metasingleconn_t * )params;
 
-	return ldap_sasl_bind_s( ld, lsc->msc_bound_ndn.bv_val,
-			LDAP_SASL_SIMPLE, &lsc->msc_cred,
+	return ldap_sasl_bind_s( ld, msc->msc_bound_ndn.bv_val,
+			LDAP_SASL_SIMPLE, &msc->msc_cred,
 			NULL, NULL, NULL );
 }
 
@@ -464,25 +571,26 @@ meta_back_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
  */
 int
 meta_back_op_result(
-	struct metaconn	*lc,
+	metaconn_t	*mc,
 	Operation	*op,
 	SlapReply	*rs,
 	int		candidate )
 {
+	metainfo_t		*mi = ( metainfo_t * )op->o_bd->be_private;
+
 	int			i,
 				rerr = LDAP_SUCCESS;
-	struct metasingleconn	*lsc;
 	char			*rmsg = NULL;
 	char			*rmatch = NULL;
 	int			free_rmsg = 0,
 				free_rmatch = 0;
 
 	if ( candidate != META_TARGET_NONE ) {
-		lsc = &lc->mc_conns[ candidate ];
+		metasingleconn_t	*msc = &mc->mc_conns[ candidate ];
 
 		rs->sr_err = LDAP_SUCCESS;
 
-		ldap_get_option( lsc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
+		ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
 		if ( rs->sr_err != LDAP_SUCCESS ) {
 			/*
 			 * better check the type of error. In some cases
@@ -490,9 +598,9 @@ meta_back_op_result(
 			 * success if at least one of the targets gave
 			 * positive result ...
 			 */
-			ldap_get_option( lsc->msc_ld,
+			ldap_get_option( msc->msc_ld,
 					LDAP_OPT_ERROR_STRING, &rmsg );
-			ldap_get_option( lsc->msc_ld,
+			ldap_get_option( msc->msc_ld,
 					LDAP_OPT_MATCHED_DN, &rmatch );
 			rerr = rs->sr_err = slap_map_api2result( rs );
 
@@ -512,13 +620,14 @@ meta_back_op_result(
 		}
 
 	} else {
-		for ( i = 0, lsc = lc->mc_conns; !META_LAST( lsc ); ++i, ++lsc ) {
-			char	*msg = NULL;
-			char	*match = NULL;
+		for ( i = 0; i < mi->mi_ntargets; i++ ) {
+			metasingleconn_t	*msc = &mc->mc_conns[ i ];
+			char			*msg = NULL;
+			char			*match = NULL;
 
 			rs->sr_err = LDAP_SUCCESS;
 
-			ldap_get_option( lsc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
+			ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
 			if ( rs->sr_err != LDAP_SUCCESS ) {
 				/*
 				 * better check the type of error. In some cases
@@ -526,9 +635,9 @@ meta_back_op_result(
 				 * success if at least one of the targets gave
 				 * positive result ...
 				 */
-				ldap_get_option( lsc->msc_ld,
+				ldap_get_option( msc->msc_ld,
 						LDAP_OPT_ERROR_STRING, &msg );
-				ldap_get_option( lsc->msc_ld,
+				ldap_get_option( msc->msc_ld,
 						LDAP_OPT_MATCHED_DN, &match );
 				rs->sr_err = slap_map_api2result( rs );