ITS#6510

diff --git a/CHANGES b/CHANGES
index 6225f1f6652714666b030bd04d79b4135ae92084..49fe0926dd1ffb178a2ddffd2c288899a7105019 100644 (file)
--- 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 29ea2c8821569eb83f501bac53a3043291845bdf..e98ea7dd75110d95b4e75fc686fa47f567c82cde 100644 (file)
--- 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;