From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 26 Jan 2009 21:57:37 +0000 (+0000)
Subject: ITS#5896
X-Git-Tag: OPENLDAP_REL_ENG_2_4_14~89
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4793af4ad1ee96330f3c4970fccd3a9c1d6a1b2c;p=openldap

ITS#5896
---

diff --git a/CHANGES b/CHANGES
index 82ed8276b1..94fab91610 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.14 Engineering
 	Added libldap option to disable SASL host canonicalization (ITS#5812)
 	Fixed libldap deref handling (ITS#5768)
 	Fixed libldap peer cert memory leak (ITS#5849)
+	Fixed libldap intermediate response behavior (ITS#5896)
 	Fixed libldap_r deref building (ITS#5768)
 	Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841)
 	Added slapd syncrepl default retry setting (ITS#5825)
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index cc0fc00d09..10ca5b7d3c 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1127,7 +1127,8 @@ nextresp2:
 	if ( msgid == LDAP_RES_ANY || id == msgid ) {
 		if ( all == LDAP_MSG_ONE
 			|| ( newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT
-			    	&& newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY
+				&& newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY
+				&& newmsg->lm_msgtype != LDAP_RES_INTERMEDIATE
 			  	&& newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) )
 		{
 			*result = newmsg;