From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 20 Feb 2009 01:28:32 +0000 (+0000)
Subject: ITS#5916
X-Git-Tag: OPENLDAP_REL_ENG_2_4_15~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15f01d99900124a55f0db0b953c877f3d97cf9d0;p=openldap

ITS#5916
---

diff --git a/CHANGES b/CHANGES
index 4ba194ace5..65d33b4c29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.15 Release (2009/02/19)
+	Added libldap alias dereferencing in C API again (ITS#5916)
 	Fixed libldap GnuTLS compilation (ITS#5955)
 	Fixed slapd bconfig conversion again (ITS#5346)
 	Fixed slapd corrupt contextCSN (ITS#5947)
diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 7dfdbd16c3..5c4e234e72 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -315,7 +315,8 @@ ldap_build_search_req(
 #endif
 	{
 	    err = ber_printf( ber, "{it{seeiib", *idp,
-		LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
+		LDAP_REQ_SEARCH, base, (ber_int_t) scope,
+		(deref < 0) ? ld->ld_deref : deref,
 		(sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
 		(timelimit < 0) ? ld->ld_timelimit : timelimit,
 		attrsonly );