fix ITS#6638

[openldap] / clients / tools / ldapsearch.c

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 8f41ee96e61956d65252e1d3874dd4f8fbd0ebd3..feb3158deb07f0a8d8bd274203beaab1b3af2f12 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -594,7 +594,7 @@ handle_private_option( int i )
                                exit( EXIT_FAILURE );
                        }
                        for ( ispecs = 0; specs[ ispecs ] != NULL; ispecs++ )
-                               /* count'em */
+                               /* count'em */ ;
 
                        ds = ldap_memcalloc( ispecs + 1, sizeof( LDAPDerefSpec ) );
                        if ( ds == NULL ) {
@@ -909,16 +909,6 @@ main( int argc, char **argv )
 
        ld = tool_conn_setup( 0, &private_conn_setup );
 
-       if ( pw_file || want_bindpw ) {
-               if ( pw_file ) {
-                       rc = lutil_get_filed_password( pw_file, &passwd );
-                       if( rc ) return EXIT_FAILURE;
-               } else {
-                       passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
-                       passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-               }
-       }
-
        tool_bind( ld );
 
 getNextPage:
@@ -1307,7 +1297,7 @@ getNextPage:
 
        if (( rc == LDAP_SUCCESS ) && vlv ) {
                char    buf[BUFSIZ];
-               int     i, moreEntries, tmpSize;
+               int     i, moreEntries;
 
                /* Loop to get the next window when 
                 * enter is pressed on the terminal.