From 446f40316a882bb76e0423e2ed8b8f92b8196c44 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 27 Dec 2002 14:57:52 +0000
Subject: [PATCH] more readable diffs and reduced number of conflicts when
 adding new client-side controls

---
 clients/tools/ldapsearch.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 722e9b5af2..d7efd5f5c2 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -526,14 +526,12 @@ main( int argc, char **argv )
 	tool_bind( ld );
 
 getNextPage:
-#ifndef LDAP_CLIENT_UPDATE
 	if ( manageDSAit || noop || subentries
-		|| valuesReturnFilter || pageSize )
-#else
-	if ( manageDSAit || noop || subentries
-		|| valuesReturnFilter || pageSize || lcup )
-#endif
-	{
+			|| valuesReturnFilter || pageSize
+#ifdef LDAP_CLIENT_UPDATE
+			|| lcup
+#endif /* LDAP_CLIENT_UPDATE */
+			) {
 		int err;
 		int i=0;
 		LDAPControl c[3];
-- 
2.39.5