X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fbind.c;h=120959699f61ca10732d2c937179a78931d39bee;hb=be53e8265065e7de61a0996e37732f44e22fdec7;hp=a16256efe4256a5b695f43937fe72aefb890263a;hpb=41aad6e27f839a5ef0b65be40cce4ddbb6f8265f;p=openldap diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c index a16256efe4..120959699f 100644 --- a/servers/slapd/back-meta/bind.c +++ b/servers/slapd/back-meta/bind.c @@ -115,11 +115,11 @@ meta_back_bind( Operation *op, SlapReply *rs ) 0, 0, 0 ); } - if ( isroot && !BER_BVISNULL( &mi->mi_targets[ i ]->mt_pseudorootdn ) ) + if ( isroot && !BER_BVISNULL( &mi->mi_targets[ i ].mt_pseudorootdn ) ) { - 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.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; } @@ -177,16 +177,17 @@ meta_back_single_bind( int candidate ) { metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; - metatarget_t *mt = mi->mi_targets[ candidate ]; + metatarget_t *mt = &mi->mi_targets[ candidate ]; struct berval mdn = BER_BVNULL; dncookie dc; metasingleconn_t *msc = &mc->mc_conns[ candidate ]; - int msgid; + int msgid, + rebinding = 0; /* * Rewrite the bind dn if needed */ - dc.rwmap = &mi->mi_targets[ candidate ]->mt_rwmap; + dc.target = &mi->mi_targets[ candidate ]; dc.conn = op->o_conn; dc.rs = rs; dc.ctx = "bindDN"; @@ -207,34 +208,55 @@ rebind:; 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 ); - Debug( LDAP_DEBUG_ANY, "### %s meta_back_single_bind(%s) err=%d\n", - op->o_log_prefix, mdn.bv_val, 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 ); - if ( rs->sr_err == LDAP_UNAVAILABLE && nretries > 0 ) { + 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; @@ -243,7 +265,9 @@ retry:; rc = meta_back_init_one_conn( op, rs, mt, msc, LDAP_BACK_DONTSEND ); if ( rc ) { - nretries--; + if ( nretries > 0 ) { + nretries--; + } ldap_pvt_thread_yield(); goto rebind; } @@ -299,14 +323,16 @@ meta_back_single_dobind( metaconn_t *mc, int candidate, ldap_back_send_t sendok, - int retries ) + int nretries ) { metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; - metatarget_t *mt = mi->mi_targets[ candidate ]; + metatarget_t *mt = &mi->mi_targets[ candidate ]; metasingleconn_t *msc = &mc->mc_conns[ candidate ]; int rc; struct berval cred = BER_BVC( "" ); - int msgid; + int msgid, + rebinding = 0, + save_nretries = nretries; /* * Otherwise an anonymous bind is performed @@ -332,7 +358,7 @@ rebind:; NULL, NULL, &msgid ); if ( rc == LDAP_SUCCESS ) { LDAPMessage *res; - struct timeval tv = { 0, 0 }; + struct timeval tv; /* * handle response!!! @@ -342,24 +368,44 @@ retry:; 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(); - 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, &rs->sr_err ); - Debug( LDAP_DEBUG_ANY, "### %s meta_back_single_dobind(\"\") err=%d\n", - op->o_log_prefix, rs->sr_err, 0 ); + 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 && retries > 0 ) { + 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; @@ -367,9 +413,11 @@ retry:; /* 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 ( rc == LDAP_SUCCESS ) { ldap_pvt_thread_yield(); - retries--; + if ( nretries > 0 ) { + nretries--; + } goto rebind; } } @@ -383,10 +431,13 @@ retry:; } break; } + + } else { + rc = slap_map_api2result( rs ); } + rs->sr_err = rc; if ( rc != LDAP_SUCCESS && ( sendok & LDAP_BACK_SENDERR ) ) { - rs->sr_err = rc; send_ldap_result( op, rs ); } @@ -403,13 +454,18 @@ meta_back_dobind( metaconn_t *mc, ldap_back_send_t sendok ) { - metasingleconn_t *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 */ @@ -418,27 +474,37 @@ meta_back_dobind( 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, rs, mc, i, - LDAP_BACK_DONTSEND, META_BIND_NRETRIES ); + 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 ); @@ -451,13 +517,13 @@ meta_back_dobind( * 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; } @@ -465,7 +531,11 @@ meta_back_dobind( done:; ldap_pvt_thread_mutex_unlock( &mc->mc_mutex ); - if ( bound == 0 && sendok & LDAP_BACK_SENDERR ) { + 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; } @@ -506,16 +576,17 @@ meta_back_op_result( SlapReply *rs, int candidate ) { + metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; + int i, rerr = LDAP_SUCCESS; - metasingleconn_t *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; @@ -549,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;