X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapcompare.c;h=f7347c7b3d22f9147f8c158df17e25b2112089d6;hb=9bc2cd3987b0bf5b86c2b9be417d7119f2e9d623;hp=544719a53ac3bd530437903048b6073992efd3b2;hpb=a525a24eb5e6b5f9558326d63c395d15e8a92935;p=openldap

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index 544719a53a..f7347c7b3d 100644
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * All rights reserved.
@@ -82,10 +82,8 @@ usage( void )
 	fprintf( stderr, _("  b64value\tbase64 encoding of assertion value\n"));
 
 	fprintf( stderr, _("Compare options:\n"));
-#ifdef LDAP_CONTROL_DONTUSECOPY
 	fprintf( stderr, _("  -E [!]<ext>[=<extparam>] compare extensions (! indicates criticality)\n"));
 	fprintf( stderr, _("             !dontUseCopy                (Don't Use Copy)\n"));
-#endif
 	fprintf( stderr, _("  -z         Quiet mode,"
 		" don't print anything, use return values\n"));
 	tool_common_usage();
@@ -181,13 +179,16 @@ handle_private_option( int i )
 int
 main( int argc, char **argv )
 {
-	char	*compdn = NULL, *attrs = NULL;
-	char	*sep;
+	char		*compdn = NULL, *attrs = NULL;
+	char		*sep;
 	int		rc;
-	LDAP	*ld = NULL;
-	struct berval bvalue = { 0, NULL };
+	LDAP		*ld = NULL;
+	struct berval	bvalue = { 0, NULL };
+	int		i = 0; 
+	LDAPControl	c[1];
+
 
-	tool_init();
+	tool_init( TOOL_COMPARE );
 	prog = lutil_progname( "ldapcompare", argc, argv );
 
 	tool_args( argc, argv );
@@ -238,16 +239,12 @@ main( int argc, char **argv )
 
 	tool_bind( ld );
 
-	if ( assertion || authzid || manageDSAit || noop 
+	if ( 0
 #ifdef LDAP_CONTROL_DONTUSECOPY
 		|| dontUseCopy
 #endif
 		)
 	{
-		int err;
-		int i = 0; 
-		LDAPControl c[1];
-
 #ifdef LDAP_CONTROL_DONTUSECOPY
 		if ( dontUseCopy ) {  
 			c[i].ldctl_oid = LDAP_CONTROL_DONTUSECOPY;
@@ -257,10 +254,10 @@ main( int argc, char **argv )
 			i++;    
 		}
 #endif
-
-		tool_server_controls( ld, c, i );
 	}
 
+	tool_server_controls( ld, c, i );
+
 	if ( verbose ) {
 		fprintf( stderr, _("DN:%s, attr:%s, value:%s\n"),
 			compdn, attrs, sep );
@@ -291,7 +288,7 @@ static int docompare(
 	char		*text;
 	char		**refs;
 
-	if ( not ) {
+	if ( dont ) {
 		return LDAP_SUCCESS;
 	}