ITS#4158 still more

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 6fb47737ef998b6a39b80dbfbbdec6d59c7c7918..1c1d4db1f198dbea9ba4a11c6218df8972b223f9 100644 (file)
--- 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 628b13b0b02d760fd6a1cb79a5d8fd81e80dc1ea..54bd488a9f399b3283ea5ccd25cef0d720a6606b 100644 (file)
--- 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);