{
metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
metaconn_t *mc;
- int i, ntargets = mi->mi_ntargets;
+ int ntargets = mi->mi_ntargets;
assert( ntargets > 0 );
return NULL;
}
- for ( i = 0; i < ntargets; i++ ) {
- mc->mc_conns[ i ].msc_info = mi;
- }
+ mc->mc_info = mi;
mc->mc_authz_target = META_BOUND_NONE;
mc->mc_refcnt = 1;
if ( rs->sr_err == LDAP_SERVER_DOWN
|| ( rs->sr_err != LDAP_SUCCESS && LDAP_BACK_TLS_CRITICAL( mi ) ) )
{
+
+#if 0
+ Debug( LDAP_DEBUG_ANY, "### %s meta_back_init_one_conn(TLS) ldap_unbind_ext[%d] ld=%p\n",
+ op->o_log_prefix, candidate, (void *)msc->msc_ld );
+#endif
+
ldap_unbind_ext( msc->msc_ld, NULL, NULL );
msc->msc_ld = NULL;
goto error_return;
if ( ldap_back_dn_massage( &dc, &op->o_conn->c_dn,
&msc->msc_bound_ndn ) )
{
+
+#if 0
+ Debug( LDAP_DEBUG_ANY, "### %s meta_back_init_one_conn(rewrite) ldap_unbind_ext[%d] ld=%p\n",
+ op->o_log_prefix, candidate, (void *)msc->msc_ld );
+#endif
+
ldap_unbind_ext( msc->msc_ld, NULL, NULL );
msc->msc_ld = NULL;
goto error_return;
op->o_log_prefix, candidate, buf );
}
- meta_clear_one_candidate( msc );
+ meta_clear_one_candidate( op, mc, candidate );
LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
( void )rewrite_session_delete( mt->mt_rwmap.rwm_rw, op->o_conn );
/* mc here must be the regular mc, reset and ready for init */
rc = meta_back_init_one_conn( op, rs, mc, candidate,
LDAP_BACK_CONN_ISPRIV( mc ), sendok );
+
+ /* restore the "binding" flag, in case */
if ( binding ) {
LDAP_BACK_CONN_BINDING_SET( msc );
}
"meta_back_single_dobind=%d\n",
op->o_log_prefix, candidate, rc );
if ( rc == LDAP_SUCCESS ) {
- if ( be_isroot( op ) ) {
+ if ( !BER_BVISNULL( &msc->msc_bound_ndn ) &&
+ !BER_BVISEMPTY( &msc->msc_bound_ndn ) )
+ {
LDAP_BACK_CONN_ISBOUND_SET( msc );
+
} else {
LDAP_BACK_CONN_ISANON_SET( msc );
}
+
+ /* when bound, dispose of the "binding" flag */
+ if ( binding ) {
+ LDAP_BACK_CONN_BINDING_CLEAR( msc );
+ }
}
}
}
for ( i = 0; i < mi->mi_ntargets; i++ ) {
metatarget_t *mt = mi->mi_targets[ i ];
- metasingleconn_t *msc = &mc->mc_conns[ i ];
+
+ META_CANDIDATE_RESET( &candidates[ i ] );
if ( i == cached
|| meta_back_is_candidate( mt, &op->o_req_ndn,
* be tried?
*/
if ( new_conn ) {
- ( void )meta_clear_one_candidate( msc );
+ ( void )meta_clear_one_candidate( op, mc, i );
}
/* leave the target candidate, but record the error for later use */
candidates[ i ].sr_err = lerr;
} else {
if ( new_conn ) {
- ( void )meta_clear_one_candidate( msc );
+ ( void )meta_clear_one_candidate( op, mc, i );
}
- META_CANDIDATE_RESET( &candidates[ i ] );
}
}
LDAP_BACK_CONN_BINDING_SET( msc );
}
ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+
if ( retcode != META_SEARCH_BINDING ) {
return retcode;
}
NULL, NULL, &candidates[ candidate ].sr_msgid );
switch ( rc ) {
case LDAP_SUCCESS:
+ assert( candidates[ candidate ].sr_msgid >= 0 );
META_BINDING_SET( &candidates[ candidate ] );
return META_SEARCH_BINDING;
/* This is the worst thing that could happen:
* the search will wait until the retry is over. */
if ( meta_back_retry( op, rs, mcp, candidate, LDAP_BACK_DONTSEND ) ) {
+ candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
return META_SEARCH_CANDIDATE;
}
int rc = 0, sres = LDAP_SUCCESS;
char *matched = NULL;
int last = 0, ncandidates = 0,
- initial_candidates = 0, candidate_match = 0;
+ initial_candidates = 0, candidate_match = 0,
+ needbind = 0;
+ ldap_back_send_t sendok = LDAP_BACK_SENDERR;
long i;
dncookie dc;
int is_ok = 0;
* FIXME: in case of values return filter, we might want
* to map attrs and maybe rewrite value
*/
- mc = meta_back_getconn( op, rs, NULL, LDAP_BACK_SENDERR );
+getconn:;
+ mc = meta_back_getconn( op, rs, NULL, sendok );
if ( !mc ) {
return rs->sr_err;
}
case META_SEARCH_NOT_CANDIDATE:
break;
+ case META_SEARCH_NEED_BIND:
+ ++needbind;
+ /* fallthru */
+
case META_SEARCH_CANDIDATE:
case META_SEARCH_BINDING:
- case META_SEARCH_NEED_BIND:
candidates[ i ].sr_type = REP_INTERMEDIATE;
++ncandidates;
break;
}
}
+ if ( ncandidates > 0 && needbind == ncandidates ) {
+ assert( ( sendok & LDAP_BACK_BINDING ) == 0 );
+
+ /* FIXME: better create a separate connection? */
+ sendok |= LDAP_BACK_BINDING;
+
+#if 0
+ Debug( LDAP_DEBUG_TRACE, "*** %s drop mc=%p create new connection\n",
+ op->o_log_prefix, mc, 0 );
+#endif
+
+ meta_back_release_conn( op, mc );
+ mc = NULL;
+
+ needbind = 0;
+ ncandidates = 0;
+
+ goto getconn;
+ }
+
initial_candidates = ncandidates;
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
* among the candidates
*/
for ( rc = 0; ncandidates > 0; ) {
- int gotit = 0, doabandon = 0;
+ int gotit = 0,
+ doabandon = 0;
+
+ needbind = ncandidates;
/* check time limit */
if ( op->ors_tlimit != SLAP_NO_LIMIT
op->o_log_prefix, i, retcode );
switch ( retcode ) {
- case META_SEARCH_BINDING:
case META_SEARCH_NEED_BIND:
- break;
+ needbind--;
+ /* fallthru */
- case META_SEARCH_NOT_CANDIDATE:
- /*
- * When no candidates are left,
- * the outer cycle finishes
- */
- candidates[ i ].sr_msgid = META_MSGID_IGNORE;
- --ncandidates;
+ case META_SEARCH_BINDING:
break;
case META_SEARCH_ERR:
op->o_private = savepriv;
goto finish;
}
+ /* fallthru */
+
+ case META_SEARCH_NOT_CANDIDATE:
+ /*
+ * When no candidates are left,
+ * the outer cycle finishes
+ */
+ candidates[ i ].sr_msgid = META_MSGID_IGNORE;
+ assert( ncandidates > 0 );
+ --ncandidates;
break;
case META_SEARCH_CANDIDATE:
switch ( meta_back_search_start( op, rs, &dc, &mc, i, candidates ) )
{
case META_SEARCH_CANDIDATE:
+ assert( candidates[ i ].sr_msgid >= 0 );
break;
- /* means that failed but onerr == continue */
- case META_SEARCH_NOT_CANDIDATE:
case META_SEARCH_ERR:
- candidates[ i ].sr_msgid = META_MSGID_IGNORE;
- --ncandidates;
-
if ( META_BACK_ONERR_STOP( mi ) ) {
savepriv = op->o_private;
op->o_private = (void *)i;
op->o_private = savepriv;
goto finish;
}
+ /* fallthru */
+
+ case META_SEARCH_NOT_CANDIDATE:
+ /* means that meta_back_search_start()
+ * failed but onerr == continue */
+ candidates[ i ].sr_msgid = META_MSGID_IGNORE;
+ assert( ncandidates > 0 );
+ --ncandidates;
break;
default:
assert( 0 );
default:
+ /* unrecoverable error */
rc = rs->sr_err = LDAP_OTHER;
goto finish;
}
* the outer cycle finishes
*/
candidates[ i ].sr_msgid = META_MSGID_IGNORE;
+ assert( ncandidates > 0 );
--ncandidates;
rs->sr_err = candidates[ i ].sr_err;
continue;
#endif /* ! ENABLE_REWRITE */
/* FIXME: merge all and return at the end */
+
for ( cnt = 0; references[ cnt ]; cnt++ )
;
ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
if ( LDAP_BACK_CONN_BINDING( &mc->mc_conns[ i ] ) ) {
/* if still binding, destroy */
+
+#if 0
+ Debug( LDAP_DEBUG_ANY, "### %s meta_back_search(abandon) "
+ "ldap_unbind_ext[%ld] ld=%p\n",
+ op->o_log_prefix, i, (void *)mc->mc_conns[i].msc_ld );
+#endif
+
ldap_unbind_ext( mc->mc_conns[ i ].msc_ld, NULL, NULL );
mc->mc_conns[ i ].msc_ld = NULL;
LDAP_BACK_CONN_BINDING_CLEAR( &mc->mc_conns[ i ] );
}
candidates[ i ].sr_msgid = META_MSGID_IGNORE;
+ assert( ncandidates > 0 );
+ --ncandidates;
}
}
lutil_timermul( &save_tv, 2, &save_tv );
}
- ldap_pvt_thread_yield();
+#if 0
+ if ( LogTest( LDAP_DEBUG_TRACE ) ) {
+ char buf[ BUFSIZ ];
+
+ snprintf( buf, sizeof( buf ), "%s %ld.%06ld %d/%d mc=%p",
+ op->o_log_prefix, save_tv.tv_sec, save_tv.tv_usec,
+ ncandidates, initial_candidates, mc );
+ Debug( LDAP_DEBUG_TRACE, "### %s\n", buf, 0, 0 );
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ if ( candidates[ i ].sr_msgid == META_MSGID_IGNORE ) {
+ continue;
+ }
+
+ snprintf( buf, sizeof( buf ), "[%ld] ld=%p%s%s\n",
+ i,
+ mc->mc_conns[ i ].msc_ld,
+ ( candidates[ i ].sr_msgid == META_MSGID_NEED_BIND ) ? " needbind" : "",
+ META_IS_BINDING( &candidates[ i ] ) ? " binding" : "" );
+ Debug( LDAP_DEBUG_TRACE, "### %s\n", buf, 0, 0 );
+ }
+ }
+#endif
+
+ if ( needbind == 0 ) {
+#if 0
+ Debug( LDAP_DEBUG_TRACE, "### %s select(%ld.%06ld)\n",
+ op->o_log_prefix, save_tv.tv_sec, save_tv.tv_usec );
+#endif
+ tv = save_tv;
+ (void)select( 0, NULL, NULL, NULL, &tv );
+
+ } else {
+ ldap_pvt_thread_yield();
+ }
}
}
assert( candidates[ i ].sr_msgid >= 0 );
assert( mc->mc_conns[ i ].msc_ld != NULL );
+#if 0
+ Debug( LDAP_DEBUG_ANY, "### %s meta_back_search(cleanup) "
+ "ldap_unbind_ext[%ld] ld=%p\n",
+ op->o_log_prefix, i, (void *)mc->mc_conns[i].msc_ld );
+#endif
+
/* if still binding, destroy */
ldap_unbind_ext( mc->mc_conns[ i ].msc_ld, NULL, NULL );
mc->mc_conns[ i ].msc_ld = NULL;
projects / openldap / commitdiff