]> git.sur5r.net Git - openldap/commitdiff
ITS#4151 remove extraneous sasl_bind_in_progress manipulation
authorHoward Chu <hyc@openldap.org>
Sun, 6 Nov 2005 04:02:13 +0000 (04:02 +0000)
committerHoward Chu <hyc@openldap.org>
Sun, 6 Nov 2005 04:02:13 +0000 (04:02 +0000)
servers/slapd/bind.c

index aa5c58af0a5d5a9d8e61d8cd3d3f8d19838418fe..90c6a96414ad7b85b7e63a93f46f5a380f9c340f 100644 (file)
@@ -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 );