/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* Portions Copyright 1999-2003 Howard Chu.
* All rights reserved.
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 = -1, i, gotit = 0, ndnlen, isroot = 0;
- int op_type = META_OP_ALLOW_MULTIPLE;
+ int rc = LDAP_OTHER,
+ i, gotit = 0, isroot = 0;
+
+ SlapReply *candidates = meta_back_candidates_get( op );
rs->sr_err = LDAP_SUCCESS;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, ENTRY, "meta_back_bind: dn: %s.\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "meta_back_bind: dn: %s.\n%s%s",
op->o_req_dn.bv_val, "", "" );
-#endif /* !NEW_LOGGING */
- if ( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
+ if ( op->orb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
isroot = 1;
- ber_dupbv( &op->oq_bind.rb_edn, be_root_dn( op->o_bd ) );
- op_type = META_OP_REQUIRE_ALL;
+ ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
}
- lc = meta_back_getconn( op, rs, op_type,
- &op->o_req_ndn, NULL );
- if ( !lc ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, NOTICE,
- "meta_back_bind: no target for dn %s.\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
- "meta_back_bind: no target for dn %s.\n%s%s",
- op->o_req_dn.bv_val, "", "");
-#endif /* !NEW_LOGGING */
+ /* we need meta_back_getconn() not send result even on error,
+ * because we want to intercept the error and make it
+ * invalidCredentials */
+ 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",
+ op->o_req_dn.bv_val, rs->sr_err,
+ rs->sr_text ? rs->sr_text : "" );
+ /* FIXME: there might be cases where we don't want
+ * to map the error onto invalidCredentials */
+ switch ( rs->sr_err ) {
+ case LDAP_NO_SUCH_OBJECT:
+ case LDAP_UNWILLING_TO_PERFORM:
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ rs->sr_text = NULL;
+ break;
+ }
send_ldap_result( op, rs );
- return -1;
+ return rs->sr_err;
}
/*
* Each target is scanned ...
*/
- lc->bound_target = META_BOUND_NONE;
- ndnlen = op->o_req_ndn.bv_len;
- for ( i = 0; i < li->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->oq_bind.rb_cred;
- int orig_method = op->oq_bind.rb_method;
-
+ Operation op2 = *op;
/*
* Skip non-candidates
*/
- if ( lc->conns[ i ].candidate != META_CANDIDATE ) {
+ if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
continue;
}
if ( gotit == 0 ) {
gotit = 1;
- } else {
+
+ } else if ( isroot == 0 ) {
/*
* A bind operation is expected to have
* ONE CANDIDATE ONLY!
*/
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, WARNING,
- "==>meta_back_bind: more than one"
- " candidate is attempting to bind"
- " ...\n" , 0, 0, 0 );
-#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ANY,
"==>meta_back_bind: more than one"
- " candidate is attempting to bind"
- " ...\n%s%s%s",
- "", "", "" );
-#endif /* !NEW_LOGGING */
+ " candidate is trying to bind...\n",
+ 0, 0, 0 );
}
- if ( isroot && li->targets[ i ]->pseudorootdn.bv_val != NULL ) {
- op->o_req_dn = li->targets[ i ]->pseudorootdn;
- op->o_req_ndn = li->targets[ i ]->pseudorootdn;
- op->oq_bind.rb_cred = li->targets[ i ]->pseudorootpw;
- op->oq_bind.rb_method = LDAP_AUTH_SIMPLE;
+ 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.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;
- ( void )meta_clear_one_candidate( &lc->conns[ i ], 1 );
+ candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+
} else {
rc = LDAP_SUCCESS;
}
-
- op->o_req_dn = orig_dn;
- op->o_req_ndn = orig_ndn;
- op->oq_bind.rb_cred = orig_cred;
- op->oq_bind.rb_method = orig_method;
}
if ( isroot ) {
- lc->bound_target = META_BOUND_ALL;
+ mc->mc_auth_target = META_BOUND_ALL;
}
/*
* err is the last error that occurred during a bind;
* if at least (and at most?) one bind succeedes, fine.
*/
- if ( rc != LDAP_SUCCESS /* && rs->sr_err != LDAP_SUCCESS */ ) {
+ if ( rc != LDAP_SUCCESS ) {
/*
* deal with bind failure ...
rs->sr_err = slap_map_api2result( rs );
send_ldap_result( op, rs );
- return -1;
+ return rs->sr_err;
}
- return 0;
+ return LDAP_SUCCESS;
}
/*
- * 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;
- struct berval mdn = BER_BVNULL;
- ber_int_t msgid;
- dncookie dc;
- struct metasingleconn *lsc = &lc->conns[ candidate ];
- LDAPMessage *res;
+ metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
+ metatarget_t *mt = &mi->mi_targets[ candidate ];
+ struct berval mdn = BER_BVNULL;
+ dncookie dc;
+ metasingleconn_t *msc = &mc->mc_conns[ candidate ];
+ int msgid,
+ rebinding = 0;
/*
* Rewrite the bind dn if needed
*/
- dc.rwmap = &li->targets[ candidate ]->rwmap;
+ dc.target = &mi->mi_targets[ candidate ];
dc.conn = op->o_conn;
dc.rs = rs;
dc.ctx = "bindDN";
return -1;
}
- if ( op->o_ctrls ) {
- rs->sr_err = ldap_set_option( lsc->ld,
- LDAP_OPT_SERVER_CONTROLS, op->o_ctrls );
- if ( rs->sr_err != LDAP_SUCCESS ) {
- rs->sr_err = slap_map_api2result( rs );
- goto return_results;
- }
- }
-
/* FIXME: this fixes the bind problem right now; we need
* to use the asynchronous version to get the "matched"
* and more in case of failure ... */
- rs->sr_err = ldap_sasl_bind_s(lsc->ld, mdn.bv_val,
- LDAP_SASL_SIMPLE, &op->oq_bind.rb_cred,
- op->o_ctrls, NULL, NULL);
+ /* 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;
+ int rc;
+ 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:
+ 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();
+ if ( nretries > 0 ) {
+ nretries--;
+ }
+ goto retry;
+ }
+ rs->sr_err = 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 = mt->mt_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_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( msc->msc_ld, res, &rs->sr_err,
+ NULL, NULL, NULL, NULL, 1 );
+ if ( rc != LDAP_SUCCESS ) {
+ rs->sr_err = rc;
+ }
+ break;
+ }
+ }
+
if ( rs->sr_err != LDAP_SUCCESS ) {
rs->sr_err = slap_map_api2result( rs );
goto return_results;
}
- /*
- * FIXME: handle response!!!
- */
- if ( lsc->bound_dn.bv_val != NULL ) {
- ber_memfree( lsc->bound_dn.bv_val );
- }
- ber_dupbv( &lsc->bound_dn, &op->o_req_dn );
- lsc->bound = META_BOUND;
- lc->bound_target = candidate;
-
- if ( li->savecred ) {
- if ( lsc->cred.bv_val ) {
- memset( lsc->cred.bv_val, 0, lsc->cred.bv_len );
- ber_memfree( lsc->cred.bv_val );
- }
- ber_dupbv( &lsc->cred, &op->oq_bind.rb_cred );
- ldap_set_rebind_proc( lsc->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->cache.ttl != META_DNCACHE_DISABLED
- && op->o_req_ndn.bv_len != 0 ) {
- ( void )meta_dncache_update_entry( &li->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 );
}
}
/*
- * meta_back_dobind
+ * meta_back_single_dobind
*/
int
-meta_back_dobind( struct metaconn *lc, Operation *op )
+meta_back_single_dobind(
+ Operation *op,
+ SlapReply *rs,
+ metaconn_t *mc,
+ int candidate,
+ ldap_back_send_t sendok,
+ int nretries )
{
- struct metasingleconn *lsc;
- int bound = 0, i;
+ 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;
/*
- * all the targets are bound as pseudoroot
+ * Otherwise an anonymous bind is performed
+ * (note: if the target was already bound, the anonymous
+ * bind clears the previous bind).
*/
- if ( lc->bound_target == META_BOUND_ALL ) {
- return 1;
+ 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 );
}
- for ( i = 0, lsc = lc->conns; !META_LAST(lsc); ++i, ++lsc ) {
- int rc;
- struct berval cred = BER_BVC("");
+ /* 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;
/*
- * Not a candidate or something wrong with this target ...
+ * handle response!!!
*/
- if ( lsc->ld == NULL ) {
- continue;
- }
+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;
+ }
- /*
- * If required, set controls
- */
- if ( op->o_ctrls ) {
- if ( ldap_set_option( lsc->ld, LDAP_OPT_SERVER_CONTROLS,
- op->o_ctrls ) != LDAP_SUCCESS ) {
- ( void )meta_clear_one_candidate( lsc, 1 );
- continue;
+ 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(
+ Operation *op,
+ SlapReply *rs,
+ metaconn_t *mc,
+ ldap_back_send_t sendok )
+{
+ 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
+ */
+ if ( mc->mc_auth_target == META_BOUND_ALL ) {
+ bound = 1;
+ goto done;
+ }
+
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ metatarget_t *mt = &mi->mi_targets[ i ];
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
+ int rc;
+
/*
- * If the target is already bound it is skipped
+ * Not a candidate
*/
- if ( lsc->bound == META_BOUND && lc->bound_target == i ) {
- ++bound;
+ if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
continue;
}
+ assert( msc->msc_ld != NULL );
+
/*
- * Otherwise an anonymous bind is performed
- * (note: if the target was already bound, the anonymous
- * bind clears the previous bind).
+ * If the target is already bound it is skipped
*/
- if ( lsc->bound_dn.bv_val ) {
- ber_memfree( lsc->bound_dn.bv_val );
- lsc->bound_dn.bv_val = NULL;
- lsc->bound_dn.bv_len = 0;
- }
-
- if ( /* FIXME: need li ... li->savecred && */
- lsc->cred.bv_val ) {
- memset( lsc->cred.bv_val, 0, lsc->cred.bv_len );
- ber_memfree( lsc->cred.bv_val );
- lsc->cred.bv_val = NULL;
- lsc->cred.bv_len = 0;
+ 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 = ldap_sasl_bind_s(lsc->ld, "", LDAP_SASL_SIMPLE, &cred,
- op->o_ctrls, NULL, NULL);
+ rc = meta_back_single_dobind( op, rs, mc, i,
+ LDAP_BACK_DONTSEND, mt->mt_nretries );
if ( rc != LDAP_SUCCESS ) {
-
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, WARNING,
- "meta_back_dobind: (anonymous)"
- " bind failed"
- " with error %d (%s)\n",
- rc, ldap_err2string( rc ), 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
- "==>meta_back_dobind: (anonymous)"
- " bind failed"
- " with error %d (%s)\n",
- rc, ldap_err2string( rc ), 0 );
-#endif /* !NEW_LOGGING */
+ 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
* due to technical reasons (remote host down?)
* so better clear the handle
*/
- ( void )meta_clear_one_candidate( lsc, 1 );
+ candidates[ i ].sr_tag = META_NOT_CANDIDATE;
continue;
} /* else */
- lsc->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 );
-}
+done:;
+ ldap_pvt_thread_mutex_unlock( &mc->mc_mutex );
-/*
- *
- */
-int
-meta_back_is_valid( struct metaconn *lc, int candidate )
-{
- struct metasingleconn *lsc;
- int i;
+ Debug( LDAP_DEBUG_TRACE,
+ "%s meta_back_dobind: conn=%ld bound=%d\n",
+ op->o_log_prefix, mc->mc_conn->c_connid, bound );
- assert( lc );
-
- if ( candidate < 0 ) {
- return 0;
- }
-
- for ( i = 0, lsc = lc->conns; !META_LAST(lsc) && i < candidate;
- ++i, ++lsc );
-
- if ( !META_LAST(lsc) ) {
- return( lsc->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 );
}
/*
* 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 *lc = params;
+ metasingleconn_t *msc = ( metasingleconn_t * )params;
- return ldap_bind_s( ld, lc->bound_dn.bv_val, lc->cred.bv_val,
- LDAP_AUTH_SIMPLE );
+ return ldap_sasl_bind_s( ld, msc->msc_bound_ndn.bv_val,
+ LDAP_SASL_SIMPLE, &msc->msc_cred,
+ NULL, NULL, NULL );
}
/*
* FIXME: error return must be handled in a cleaner way ...
*/
int
-meta_back_op_result( struct metaconn *lc, Operation *op, SlapReply *rs )
+meta_back_op_result(
+ metaconn_t *mc,
+ Operation *op,
+ SlapReply *rs,
+ int candidate )
{
- int i, rerr = LDAP_SUCCESS;
- struct metasingleconn *lsc;
- char *rmsg = NULL;
- char *rmatch = NULL;
- int free_rmsg = 0, free_rmatch = 0;
+ metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
- for ( i = 0, lsc = lc->conns; !META_LAST(lsc); ++i, ++lsc ) {
- char *msg = NULL;
- char *match = NULL;
+ int i,
+ rerr = LDAP_SUCCESS;
+ char *rmsg = NULL;
+ char *rmatch = NULL;
+ int free_rmsg = 0,
+ free_rmatch = 0;
+
+ if ( candidate != META_TARGET_NONE ) {
+ metasingleconn_t *msc = &mc->mc_conns[ candidate ];
rs->sr_err = LDAP_SUCCESS;
- ldap_get_option( lsc->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
* success if at least one of the targets gave
* positive result ...
*/
- ldap_get_option( lsc->ld,
- LDAP_OPT_ERROR_STRING, &msg );
- ldap_get_option( lsc->ld,
- LDAP_OPT_MATCHED_DN, &match );
- rs->sr_err = slap_map_api2result( rs );
+ ldap_get_option( msc->msc_ld,
+ LDAP_OPT_ERROR_STRING, &rmsg );
+ ldap_get_option( msc->msc_ld,
+ LDAP_OPT_MATCHED_DN, &rmatch );
+ rerr = rs->sr_err = slap_map_api2result( rs );
+
+ if ( rmsg ) {
+ free_rmsg = 1;
+ }
+ if ( rmatch ) {
+ free_rmatch = 1;
+ }
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, RESULTS,
- "meta_back_op_result: target"
- " <%d> sending msg \"%s\""
- " (matched \"%s\")\n",
- i, ( msg ? msg : "" ),
- ( match ? match : "" ) );
-#else /* !NEW_LOGGING */
Debug(LDAP_DEBUG_ANY,
"==> meta_back_op_result: target"
" <%d> sending msg \"%s\""
" (matched \"%s\")\n",
- i, ( msg ? msg : "" ),
- ( match ? match : "" ) );
-#endif /* !NEW_LOGGING */
+ candidate, ( rmsg ? rmsg : "" ),
+ ( rmatch ? rmatch : "" ) );
+ }
- /*
- * FIXME: need to rewrite "match" (need rwinfo)
- */
- switch ( rs->sr_err ) {
- default:
- rerr = rs->sr_err;
- if ( rmsg ) {
- ber_memfree( rmsg );
+ } else {
+ 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( 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
+ * (search ?) it might be better to return a
+ * success if at least one of the targets gave
+ * positive result ...
+ */
+ ldap_get_option( msc->msc_ld,
+ LDAP_OPT_ERROR_STRING, &msg );
+ ldap_get_option( msc->msc_ld,
+ LDAP_OPT_MATCHED_DN, &match );
+ rs->sr_err = slap_map_api2result( rs );
+
+ Debug(LDAP_DEBUG_ANY,
+ "==> meta_back_op_result: target"
+ " <%d> sending msg \"%s\""
+ " (matched \"%s\")\n",
+ i, ( msg ? msg : "" ),
+ ( match ? match : "" ) );
+
+ /*
+ * FIXME: need to rewrite "match" (need rwinfo)
+ */
+ switch ( rs->sr_err ) {
+ default:
+ rerr = rs->sr_err;
+ if ( rmsg ) {
+ ber_memfree( rmsg );
+ }
+ rmsg = msg;
+ free_rmsg = 1;
+ msg = NULL;
+ if ( rmatch ) {
+ ber_memfree( rmatch );
+ }
+ rmatch = match;
+ free_rmatch = 1;
+ match = NULL;
+ break;
}
- rmsg = msg;
- free_rmsg = 1;
- msg = NULL;
- if ( rmatch ) {
- ber_memfree( rmatch );
+
+ /* better test the pointers before freeing? */
+ if ( match ) {
+ free( match );
+ }
+ if ( msg ) {
+ free( msg );
}
- rmatch = match;
- free_rmatch = 1;
- match = NULL;
- break;
- }
-
- /* better test the pointers before freeing? */
- if ( match ) {
- free( match );
- }
- if ( msg ) {
- free( msg );
}
}
}
-
+
rs->sr_err = rerr;
rs->sr_text = rmsg;
rs->sr_matched = rmatch;
projects / openldap / blobdiff