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

This commit is contained in:
Pierangelo Masarati 2002-12-27 14:57:52 +00:00
parent 8527127602
commit 446f40316a

View File

@ -526,14 +526,12 @@ main( int argc, char **argv )
tool_bind( ld ); tool_bind( ld );
getNextPage: getNextPage:
#ifndef LDAP_CLIENT_UPDATE
if ( manageDSAit || noop || subentries if ( manageDSAit || noop || subentries
|| valuesReturnFilter || pageSize ) || valuesReturnFilter || pageSize
#else #ifdef LDAP_CLIENT_UPDATE
if ( manageDSAit || noop || subentries || lcup
|| valuesReturnFilter || pageSize || lcup ) #endif /* LDAP_CLIENT_UPDATE */
#endif ) {
{
int err; int err;
int i=0; int i=0;
LDAPControl c[3]; LDAPControl c[3];