ITS#5916,ITS#6003

CHANGES

@@ -11,6 +11,7 @@ OpenLDAP 2.4.16 Engineering
 	Fixed slapd syncrepl newCookie sync messages (ITS#5972)
 	Fixed slapd syncrepl multiple CSN propagation (ITS#5973)
 	Fixed slapd-bdb/hdb cachesize handling (ITS#5860)
+	Fixed slapd-ldap incorrect referral handling (ITS#6003,ITS#5916)
 	Fixed slapd-ldap/meta with broken AD results (ITS#5977)
 	Fixed slapd-ldap/meta with invalid attrs again (ITS#5959)
 	Fixed slapo-accesslog interaction with ppolicy (ITS#5979)

servers/slapd/back-ldap/search.c

@@ -929,8 +929,8 @@ retry:
 
 	/* TODO: timeout? */
 	rc = ldap_pvt_search_s( lc->lc_ld, ndn->bv_val, LDAP_SCOPE_BASE, filter,
-				attrp, 0, ctrls, NULL,
-				NULL, LDAP_NO_LIMIT, op->ors_deref, &result );
+				attrp, LDAP_DEREF_NEVER, ctrls, NULL,
+				NULL, LDAP_NO_LIMIT, 0, &result );
 	if ( rc != LDAP_SUCCESS ) {
 		if ( rc == LDAP_SERVER_DOWN && do_retry ) {
 			do_retry = 0;