From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 16 Apr 2010 01:59:41 +0000 (+0000)
Subject: ITS#6510
X-Git-Tag: OPENLDAP_REL_ENG_2_4_22~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb4761c71703bfef45b7b6a1d0d7c4ac7cdacc3c;p=openldap

ITS#6510
---

diff --git a/CHANGES b/CHANGES
index 6225f1f665..49fe0926dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.4.22 Engineering
 	Added slapo-pbind
 	Fixed libldap GnuTLS serial length (ITS#6460)
 	Fixed libldap MozNSS context and PEM support (ITS#6432)
+	Fixed libldap referral on bind behavior(ITS#6510)
 	Fixed slapd acl non-entry internal searches (ITS#6481)
 	Fixed slapd acl attrval style initialization (ITS#6520)
 	Fixed slapd certificateListValidate (ITS#6466)
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 29ea2c8821..e98ea7dd75 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -747,8 +747,9 @@ nextresp2:
 			}
 
 			/* Do we need to check for referrals? */
-			if ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ||
-					lr->lr_parent != NULL )
+			if ( tag != LDAP_RES_BIND &&
+				( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ||
+					lr->lr_parent != NULL ))
 			{
 				char		**refs = NULL;
 				ber_len_t	len;