From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 7 Jul 2009 22:31:35 +0000 (+0000)
Subject: ITS#6101, did not always (re)set rs->sr_sasldata before send_ldap_sasl()
X-Git-Tag: ACLCHECK_0~443
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d3e7717473503e286f39eef1f5ae7f214f0deb04;p=openldap

ITS#6101, did not always (re)set rs->sr_sasldata before send_ldap_sasl()
---

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 14e3d25b6e..e12a82946f 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1540,7 +1540,7 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
 		}
 
 		/* Must send response using old security layer */
-		if (response.bv_len) rs->sr_sasldata = &response;
+		rs->sr_sasldata = (response.bv_len ? &response : NULL);
 		send_ldap_sasl( op, rs );
 		
 		/* Now dispose of the old security layer.