From ed97e969445ec47fe6cc69e5b0ef00adf42be2e2 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 20 Feb 2009 01:07:00 +0000
Subject: [PATCH] re-fix ITS#5916

---
 libraries/libldap/search.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 );