Debug( LDAP_DEBUG_ARGS, "meta_back_bind: dn: %s.\n%s%s",
op->o_req_dn.bv_val, "", "" );
- if ( op->orb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
+ if ( op->orb_method == LDAP_AUTH_SIMPLE
+ && be_isroot_dn( op->o_bd, &op->o_req_ndn ) )
+ {
+ if ( !be_isroot_pw( op ) ) {
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ rs->sr_text = NULL;
+ send_ldap_result( op, rs );
+ return rs->sr_err;
+ }
isroot = 1;
- ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
}
/* we need meta_back_getconn() not send result even on error,
rs->sr_err = lerr;
candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+ if ( META_BACK_ONERR_STOP( mi ) ) {
+ rc = rs->sr_err;
+ break;
+ }
+
} else {
rc = LDAP_SUCCESS;
}
}
- if ( isroot ) {
+ if ( isroot && rc == LDAP_SUCCESS ) {
mc->mc_auth_target = META_BOUND_ALL;
+ ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
}
meta_back_release_conn( op, mc );
op->o_ctrls, NULL, &msgid );
if ( rs->sr_err == LDAP_SUCCESS ) {
LDAPMessage *res;
- struct timeval tv;
+ struct timeval tv = { 0, 100000 };
int rc;
int nretries = mt->mt_nretries;
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 );
+ Debug( LDAP_DEBUG_ANY,
+ "%s meta_back_single_bind: "
+ "ldap_result=0 nretries=%d%s\n",
+ op->o_log_prefix, nretries,
+ rebinding ? " rebinding" : "" );
if ( nretries != META_RETRY_NEVER ) {
ldap_pvt_thread_yield();
if ( nretries > 0 ) {
nretries--;
}
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
goto retry;
}
rs->sr_err = LDAP_BUSY;
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
}
- Debug( LDAP_DEBUG_ANY, "### %s meta_back_single_bind: err=%d nretries=%d\n",
+ 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 ) {
-retry_lock:;
- switch ( ldap_pvt_thread_mutex_trylock( &mi->mi_conn_mutex ) ) {
- case LDAP_PVT_THREAD_EBUSY:
- default:
- ldap_pvt_thread_yield();
- goto retry_lock;
-
- case 0:
- break;
- }
-
+ ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
if ( mc->mc_refcnt == 1 ) {
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 );
+ ( 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,
+ mt, msc, LDAP_BACK_DONTSEND );
} else {
/* can't do anything about it */
NULL, NULL, &msgid );
if ( rc == LDAP_SUCCESS ) {
LDAPMessage *res;
- struct timeval tv;
+ struct timeval tv = { 0, 100000 };
/*
* handle response!!!
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 );
+ Debug( LDAP_DEBUG_ANY,
+ "%s meta_back_single_dobind: "
+ "ldap_result=0 nretries=%d%s\n",
+ op->o_log_prefix, nretries,
+ rebinding ? " rebinding" : "" );
if ( nretries != META_RETRY_NEVER ) {
ldap_pvt_thread_yield();
if ( nretries > 0 ) {
nretries--;
}
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
goto retry;
}
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 );
+ 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 ) {
if ( dolock ) {
-retry_lock:;
- switch ( ldap_pvt_thread_mutex_trylock( &mi->mi_conn_mutex ) ) {
- case LDAP_PVT_THREAD_EBUSY:
- default:
- ldap_pvt_thread_yield();
- goto retry_lock;
-
- case 0:
- break;
- }
+ ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
}
if ( mc->mc_refcnt == 1 ) {
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 );
+ ( 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,
+ mt, msc, LDAP_BACK_DONTSEND );
} else {
}
} else {
+ rs->sr_err = rc;
rc = slap_map_api2result( rs );
}
{
metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
- int bound = 0, i;
+ int bound = 0,
+ i,
+ isroot = 0;
SlapReply *candidates = meta_back_candidates_get( op );
- ldap_pvt_thread_mutex_lock( &mc->mc_mutex );
+ if ( be_isroot( op ) ) {
+ isroot = 1;
+ }
Debug( LDAP_DEBUG_TRACE,
- "%s meta_back_dobind: conn=%ld\n",
- op->o_log_prefix, mc->mc_conn->c_connid, 0 );
+ "%s meta_back_dobind: conn=%ld%s\n",
+ op->o_log_prefix, mc->mc_conn->c_connid,
+ isroot ? " (isroot)" : "" );
+
+ ldap_pvt_thread_mutex_lock( &mc->mc_mutex );
/*
* all the targets are bound as pseudoroot
continue;
}
- rc = meta_back_single_dobind( op, rs, mc, i,
+ if ( isroot && !BER_BVISNULL( &mi->mi_targets[ i ].mt_pseudorootdn ) )
+ {
+ Operation op2 = *op;
+
+ op2.o_tag = LDAP_REQ_BIND;
+ 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;
+
+ rc = meta_back_single_bind( &op2, rs, mc, i );
+
+ } else {
+ rc = meta_back_single_dobind( op, rs, mc, i,
LDAP_BACK_DONTSEND, mt->mt_nretries, 1 );
- if ( rc != LDAP_SUCCESS ) {
- rs->sr_err = slap_map_api2result( rs );
+ }
+ if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "%s meta_back_dobind[%d]: "
"(anonymous) err=%d\n",
op->o_log_prefix, i, rc );
* due to technical reasons (remote host down?)
* so better clear the handle
*/
- candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+ /* leave the target candidate, but record the error for later use */
+ candidates[ i ].sr_err = rc;
+ if ( META_BACK_ONERR_STOP( mi ) ) {
+ bound = 0;
+ goto done;
+ }
continue;
} /* else */
int i,
rerr = LDAP_SUCCESS;
- char *rmsg = NULL;
- char *rmatch = NULL;
- int free_rmsg = 0,
- free_rmatch = 0;
+ char *rmsg = NULL,
+ *rmatch = NULL;
+ const char *save_rmsg = NULL,
+ *save_rmatch = NULL;
+ void *rmatch_ctx = NULL;
if ( candidate != META_TARGET_NONE ) {
metasingleconn_t *msc = &mc->mc_conns[ candidate ];
*/
ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &rmsg );
+ if ( rmsg != NULL && rmsg[ 0 ] == '\0' ) {
+ ldap_memfree( rmsg );
+ rmsg = NULL;
+ }
+
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;
+ if ( rmatch != NULL && rmatch[ 0 ] == '\0' ) {
+ ldap_memfree( rmatch );
+ rmatch = NULL;
}
+ rerr = rs->sr_err = slap_map_api2result( rs );
+
Debug(LDAP_DEBUG_ANY,
"==> meta_back_op_result: target"
" <%d> sending msg \"%s\""
*/
ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &msg );
+ if ( msg != NULL && msg[ 0 ] == '\0' ) {
+ ldap_memfree( msg );
+ msg = NULL;
+ }
+
ldap_get_option( msc->msc_ld,
LDAP_OPT_MATCHED_DN, &match );
+ if ( match != NULL && match[ 0 ] == '\0' ) {
+ ldap_memfree( match );
+ match = NULL;
+ }
+
rs->sr_err = slap_map_api2result( rs );
Debug(LDAP_DEBUG_ANY,
switch ( rs->sr_err ) {
default:
rerr = rs->sr_err;
- if ( rmsg ) {
- ber_memfree( rmsg );
+ if ( msg != NULL ) {
+ if ( rmsg ) {
+ ldap_memfree( rmsg );
+ }
+ rmsg = msg;
+ msg = NULL;
}
- rmsg = msg;
- free_rmsg = 1;
- msg = NULL;
- if ( rmatch ) {
- ber_memfree( rmatch );
+ if ( match != NULL ) {
+ if ( rmatch ) {
+ ldap_memfree( rmatch );
+ }
+ rmatch = match;
+ match = NULL;
}
- rmatch = match;
- free_rmatch = 1;
- match = NULL;
break;
}
+
+ if ( msg ) {
+ ldap_memfree( msg );
+ }
- /* better test the pointers before freeing? */
if ( match ) {
- free( match );
- }
- if ( msg ) {
- free( msg );
+ ldap_memfree( match );
}
}
}
}
rs->sr_err = rerr;
- rs->sr_text = rmsg;
- rs->sr_matched = rmatch;
+ if ( rmsg != NULL ) {
+ save_rmsg = rs->sr_text;
+ rs->sr_text = rmsg;
+ }
+ if ( rmatch != NULL ) {
+ struct berval dn, pdn;
+
+ ber_str2bv( rmatch, 0, 0, &dn );
+ if ( dnPretty( NULL, &dn, &pdn, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
+ ldap_memfree( rmatch );
+ rmatch_ctx = op->o_tmpmemctx;
+ rmatch = pdn.bv_val;
+ }
+ save_rmatch = rs->sr_matched;
+ rs->sr_matched = rmatch;
+ }
send_ldap_result( op, rs );
- if ( free_rmsg ) {
+ if ( rmsg != NULL ) {
ber_memfree( rmsg );
+ rs->sr_text = save_rmsg;
}
- if ( free_rmatch ) {
- ber_memfree( rmatch );
+ if ( rmatch != NULL ) {
+ ber_memfree_x( rmatch, rmatch_ctx );
+ rs->sr_matched = save_rmatch;
}
- rs->sr_text = NULL;
- rs->sr_matched = NULL;
return ( ( rerr == LDAP_SUCCESS ) ? 0 : -1 );
}
projects / openldap / blobdiff