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

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 9cbc4edcca..120959699f 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -37,16 +37,16 @@ static LDAP_REBIND_PROC	meta_back_rebind;
 
 static int
 meta_back_single_bind(
-		Operation		*op,
-		SlapReply		*rs,
-		struct metaconn		*mc,
-		int			candidate );
+	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 *mc;
+	metainfo_t	*mi = ( metainfo_t * )op->o_bd->be_private;
+	metaconn_t	*mc;
 
 	int		rc = LDAP_OTHER,
 			i, gotit = 0, isroot = 0;
@@ -90,7 +90,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
 	 * Each target is scanned ...
 	 */
 	mc->mc_auth_target = META_BOUND_NONE;
-	for ( i = 0; i < li->mi_ntargets; i++ ) {
+	for ( i = 0; i < mi->mi_ntargets; i++ ) {
 		int		lerr;
 		Operation	op2 = *op;
 
@@ -115,11 +115,11 @@ 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 ) )
 		{
-			op2.o_req_dn = li->mi_targets[ i ]->mt_pseudorootdn;
-			op2.o_req_ndn = li->mi_targets[ i ]->mt_pseudorootdn;
-			op2.orb_cred = li->mi_targets[ i ]->mt_pseudorootpw;
+			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;
 		}
 		
@@ -171,22 +171,23 @@ meta_back_bind( Operation *op, SlapReply *rs )
  */
 static int
 meta_back_single_bind(
-		Operation		*op,
-		SlapReply		*rs,
-		struct metaconn		*mc,
-		int			candidate
-)
+	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	*msc = &mc->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";
@@ -201,38 +202,74 @@ meta_back_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? */
+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 = META_BIND_NRETRIES;
+		int		nretries = mt->mt_nretries;
 
 		/*
 		 * 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:
-			if ( nretries > 0 ) {
+			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;
-				nretries--;
+				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( msc->msc_ld, LDAP_OPT_ERROR_NUMBER,
 					&rs->sr_err );
-			if ( rs->sr_err == LDAP_UNAVAILABLE && nretries > 0 ) {
-				nretries--;
-				if ( meta_back_retry( op, rs, mc, candidate, LDAP_BACK_SENDERR ) ) {
-					goto retry;
+
+			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;
@@ -256,15 +293,15 @@ retry:;
 	msc->msc_bound = META_BOUND;
 	mc->mc_auth_target = candidate;
 
-	if ( LDAP_BACK_SAVECRED( li ) ) {
+	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
+	if ( mi->mi_cache.ttl != META_DNCACHE_DISABLED
 			&& op->o_req_ndn.bv_len != 0 )
 	{
-		( void )meta_dncache_update_entry( &li->mi_cache,
+		( void )meta_dncache_update_entry( &mi->mi_cache,
 				&op->o_req_ndn, candidate );
 	}
 
@@ -282,13 +319,20 @@ return_results:;
 int
 meta_back_single_dobind(
 	Operation		*op,
-	struct metasingleconn	*msc,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	int			candidate,
 	ldap_back_send_t	sendok,
-	int			retries )
+	int			nretries )
 {
-	int		rc;
-	struct berval	cred = BER_BVC( "" );
-	int		msgid;
+	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
@@ -300,9 +344,7 @@ meta_back_single_dobind(
 		BER_BVZERO( &msc->msc_bound_ndn );
 	}
 		
-	if ( /* FIXME: need li ... li->savecred && */ 
-			!BER_BVISNULL( &msc->msc_cred ) )
-	{
+	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 );
@@ -311,43 +353,92 @@ meta_back_single_dobind(
 
 	/* 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 = { 0, 0 };
-		int		err;
+		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:
-			if ( retries > 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();
-				tv.tv_sec = 0;
-				tv.tv_usec = META_BIND_TIMEOUT;
-				retries--;
+				if ( nretries > 0 ) {
+					nretries--;
+				}
 				goto retry;
 			}
 
 			rc = 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 = save_nretries;
+			/* fallthru */
 
 		case -1:
 			ldap_get_option( msc->msc_ld,
-					LDAP_OPT_ERROR_NUMBER, &rc );
+					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, &err,
+			rc = ldap_parse_result( msc->msc_ld, res, &rs->sr_err,
 					NULL, NULL, NULL, NULL, 1 );
 			if ( rc == LDAP_SUCCESS ) {
-				rc = err;
+				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;
@@ -357,15 +448,24 @@ retry:;
  * meta_back_dobind
  */
 int
-meta_back_dobind( struct metaconn *mc, Operation *op, ldap_back_send_t sendok )
+meta_back_dobind(
+	Operation		*op,
+	SlapReply		*rs,
+	metaconn_t		*mc,
+	ldap_back_send_t	sendok )
 {
-	struct metasingleconn	*msc;
+	metainfo_t		*mi = ( metainfo_t * )op->o_bd->be_private;
+
 	int			bound = 0, i;
 
 	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
 	 */
@@ -374,26 +474,37 @@ meta_back_dobind( struct metaconn *mc, Operation *op, ldap_back_send_t sendok )
 		goto done;
 	}
 
-	for ( i = 0, msc = &mc->mc_conns[ 0 ]; !META_LAST( msc ); ++i, ++msc ) {
-		int		rc;
+	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 ( msc->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 ( msc->msc_bound == META_BOUND && mc->mc_auth_target == i ) {
 			++bound;
+
+			Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
+					"authcTarget\n",
+					op->o_log_prefix, i, 0 );
 			continue;
 		}
 
-		rc = meta_back_single_dobind( op, msc, sendok, META_BIND_NRETRIES );
+		rc = meta_back_single_dobind( op, rs, mc, i,
+				LDAP_BACK_DONTSEND, mt->mt_nretries );
 		if ( rc != LDAP_SUCCESS ) {
+			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 );
@@ -406,13 +517,13 @@ meta_back_dobind( struct metaconn *mc, Operation *op, ldap_back_send_t sendok )
 			 * so better clear the handle
 			 */
 			candidates[ i ].sr_tag = META_NOT_CANDIDATE;
-#if 0
-			( void )meta_clear_one_candidate( msc );
-#endif
 			continue;
 		} /* else */
 		
-		candidates[ i ].sr_tag = META_CANDIDATE;
+		Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
+				"(anonymous)\n",
+				op->o_log_prefix, i, 0 );
+
 		msc->msc_bound = META_ANONYMOUS;
 		++bound;
 	}
@@ -420,6 +531,17 @@ meta_back_dobind( struct metaconn *mc, Operation *op, ldap_back_send_t sendok )
 done:;
         ldap_pvt_thread_mutex_unlock( &mc->mc_mutex );
 
+	Debug( LDAP_DEBUG_TRACE,
+		"%s meta_back_dobind: conn=%ld bound=%d\n",
+		op->o_log_prefix, mc->mc_conn->c_connid, bound );
+
+	if ( bound == 0 && ( sendok & LDAP_BACK_SENDERR ) ) {
+		if ( rs->sr_err == LDAP_SUCCESS ) {
+			rs->sr_err = LDAP_BUSY;
+		}
+		send_ldap_result( op, rs );
+	}
+
 	return( bound > 0 );
 }
 
@@ -430,10 +552,14 @@ done:;
  * 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	*msc = (struct metasingleconn *)params;
+	metasingleconn_t	*msc = ( metasingleconn_t * )params;
 
 	return ldap_sasl_bind_s( ld, msc->msc_bound_ndn.bv_val,
 			LDAP_SASL_SIMPLE, &msc->msc_cred,
@@ -445,21 +571,22 @@ meta_back_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
  */
 int
 meta_back_op_result(
-	struct metaconn	*mc,
+	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	*msc;
 	char			*rmsg = NULL;
 	char			*rmatch = NULL;
 	int			free_rmsg = 0,
 				free_rmatch = 0;
 
 	if ( candidate != META_TARGET_NONE ) {
-		msc = &mc->mc_conns[ candidate ];
+		metasingleconn_t	*msc = &mc->mc_conns[ candidate ];
 
 		rs->sr_err = LDAP_SUCCESS;
 
@@ -493,9 +620,10 @@ meta_back_op_result(
 		}
 
 	} else {
-		for ( i = 0, msc = &mc->mc_conns[ 0 ]; !META_LAST( msc ); ++i, ++msc ) {
-			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;