From 0917e07275c7a4a1039a5aaeec555e4c294d5ae0 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 20 Sep 2006 19:21:41 +0000 Subject: [PATCH] Only set c_sasl_bindop on actual SASL binds --- servers/slapd/bind.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c index 7be6f499ad..f98618c2df 100644 --- a/servers/slapd/bind.c +++ b/servers/slapd/bind.c @@ -233,9 +233,6 @@ fe_op_bind( Operation *op, SlapReply *rs ) goto cleanup; } - /* Set the bindop for the benefit of in-directory SASL lookups */ - op->o_conn->c_sasl_bindop = op; - if ( op->orb_method == LDAP_AUTH_SASL ) { if ( op->o_protocol < LDAP_VERSION3 ) { Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n", @@ -270,6 +267,10 @@ fe_op_bind( Operation *op, SlapReply *rs ) } else { ber_dupbv(&op->o_conn->c_sasl_bind_mech, &mech); } + + /* Set the bindop for the benefit of in-directory SASL lookups */ + op->o_conn->c_sasl_bindop = op; + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); rs->sr_err = slap_sasl_bind( op, rs ); -- 2.39.2