From 62f42086f6a3d43c8b10e91eeec335f36b9b6eba Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 6 Mar 2009 08:14:56 +0000 Subject: [PATCH] ITS#5916,ITS#6003 --- CHANGES | 1 + servers/slapd/back-ldap/search.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c4d9ab45d8..61828b3df2 100644 --- a/CHANGES +++ b/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) diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c index b3a68b3141..7e1af12a9f 100644 --- a/servers/slapd/back-ldap/search.c +++ b/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; -- 2.39.5