From: Howard Chu <hyc@openldap.org>
Date: Sun, 6 Nov 2005 04:02:13 +0000 (+0000)
Subject: ITS#4151 remove extraneous sasl_bind_in_progress manipulation
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~86
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f2ee54e20d7ac70974d6368209f9e79561eca53;p=openldap

ITS#4151 remove extraneous sasl_bind_in_progress manipulation
---

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index aa5c58af0a..90c6a96414 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -286,7 +286,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
 			BER_BVZERO( &op->orb_edn );
 			op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
 			BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
-			op->o_conn->c_sasl_bind_in_progress = 0;
 
 			op->o_conn->c_sasl_ssf = op->orb_ssf;
 			if( op->orb_ssf > op->o_conn->c_ssf ) {
@@ -312,15 +311,11 @@ fe_op_bind( Operation *op, SlapReply *rs )
 				BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
 				op->orb_ssf );
 
-		} else if ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS ) {
-			op->o_conn->c_sasl_bind_in_progress = 1;
-
-		} else {
+		} else if ( rs->sr_err != LDAP_SASL_BIND_IN_PROGRESS ) {
 			if ( !BER_BVISNULL( &op->o_conn->c_sasl_bind_mech ) ) {
 				free( op->o_conn->c_sasl_bind_mech.bv_val );
 				BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
 			}
-			op->o_conn->c_sasl_bind_in_progress = 0;
 		}
 
 		ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );