more readable diffs and reduced number of conflicts when adding new client-side controls

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 722e9b5af24b1b2123f4422127c30d8c9313465c..d7efd5f5c22bad7e321e69d3b5990e1b7e13563d 100644 (file)
--- 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];