From ea92291cb63f7c61e3ec254962634a92592f3a6b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 8 Nov 2005 09:53:38 +0000 Subject: [PATCH] ITS#4158 still more --- servers/slapd/bind.c | 2 -- servers/slapd/connection.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c index 6fb47737ef..1c1d4db1f1 100644 --- a/servers/slapd/bind.c +++ b/servers/slapd/bind.c @@ -207,8 +207,6 @@ cleanup: op->o_conn->c_authtype = op->orb_method; } - op->o_conn->c_sasl_bindop = NULL; - if( !BER_BVISNULL( &op->o_req_dn ) ) { slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx ); BER_BVZERO( &op->o_req_dn ); diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 628b13b0b0..54bd488a9f 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -2008,6 +2008,7 @@ static int connection_bind_cb( Operation *op, SlapReply *rs ) ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS ); /* Moved here from bind.c due to ITS#4158 */ + op->o_conn->c_sasl_bindop = NULL; if ( op->orb_method == LDAP_AUTH_SASL ) { if( rs->sr_err == LDAP_SUCCESS ) { ber_dupbv(&op->o_conn->c_dn, &op->orb_edn); -- 2.39.5