From 947f87441e9748fb3b57fb362a220bdad3dd8063 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 26 Jan 2005 09:45:23 +0000 Subject: [PATCH] don't play with controls at bind --- servers/slapd/back-meta/bind.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c index 36dc7af36c..0dde00f584 100644 --- a/servers/slapd/back-meta/bind.c +++ b/servers/slapd/back-meta/bind.c @@ -192,18 +192,11 @@ meta_back_do_single_bind( return -1; } - if ( op->o_ctrls ) { - rs->sr_err = ldap_set_option( lsc->msc_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 ... */ + /* FIXME: should be check if at least some of the op->o_ctrls + * can/should be passed? */ rs->sr_err = ldap_sasl_bind( lsc->msc_ld, mdn.bv_val, LDAP_SASL_SIMPLE, &op->orb_cred, op->o_ctrls, NULL, &msgid ); @@ -308,17 +301,6 @@ meta_back_dobind( struct metaconn *lc, Operation *op ) continue; } - /* - * If required, set controls - */ - if ( op->o_ctrls ) { - if ( ldap_set_option( lsc->msc_ld, LDAP_OPT_SERVER_CONTROLS, - op->o_ctrls ) != LDAP_SUCCESS ) { - ( void )meta_clear_one_candidate( lsc, 1 ); - continue; - } - } - /* * If the target is already bound it is skipped */ @@ -346,8 +328,10 @@ meta_back_dobind( struct metaconn *lc, Operation *op ) BER_BVZERO( &lsc->msc_cred ); } + /* FIXME: should be check if at least some of the op->o_ctrls + * can/should be passed? */ rc = ldap_sasl_bind( lsc->msc_ld, "", LDAP_SASL_SIMPLE, &cred, - op->o_ctrls, NULL, &msgid ); + NULL, NULL, &msgid ); if ( rc == LDAP_SUCCESS ) { LDAPMessage *res; struct timeval tv = { 0, 0 }; -- 2.39.5