From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 11 Aug 2007 09:30:52 +0000 (+0000)
Subject: fix previous commit: op is not a bind if error
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~239
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8636d8e604bb387a0ca74a39ee58932a71ea42d;p=openldap

fix previous commit: op is not a bind if error
---

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 1c125b721e..9d122e36a2 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -1297,7 +1297,7 @@ retry_lock:;
 	 * then bind as the asserting identity and explicitly 
 	 * add the proxyAuthz control to every operation with the
 	 * dn bound to the connection as control value.
-	 * This is done also if this is the authrizing backend,
+	 * This is done also if this is the authorizing backend,
 	 * but the "override" flag is given to idassert.
 	 * It allows to use SASL bind and yet proxyAuthz users
 	 */
@@ -1420,6 +1420,9 @@ retry:;
 		if ( rs->sr_err != LDAP_SUCCESS &&
 			( sendok & LDAP_BACK_SENDERR ) )
 		{
+			if ( op->o_callback == &cb )
+				op->o_callback = cb.sc_next;
+			op->o_tag = o_tag;
 			rs->sr_text = "Internal proxy bind failure";
 			send_ldap_result( op, rs );
 		}
@@ -1444,7 +1447,7 @@ done:;
 		ldap_set_rebind_proc( lc->lc_ld, li->li_rebind_f, lc );
 	}
 
-leave:
+leave:;
 	if ( op->o_callback == &cb )
 		op->o_callback = cb.sc_next;
 	op->o_tag = o_tag;