Import minor changes from devel

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 2bb835a64e024741955d2575287384b4f76a59a9..50c05c4d01fcecb5f7dcb6439e292e50e976bde7 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -600,7 +600,7 @@ main( int argc, char **argv )
 
 
        if (version == -1 ) {
-               version = 3;
+               version = LDAP_VERSION3;
        }
 
        if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version )

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 2c9f5e868a0197996ee90fb66ad28fcc2d19b485..15ba0d20d88356705a9724319006b7f7e0901382 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -533,7 +533,6 @@ main( int argc, char *argv[] )
 
        if (want_bindpw && passwd.bv_val == NULL ) {
                /* handle bind password */
-               fprintf( stderr, "Bind DN: %s\n", binddn );
                passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
                passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
        }
@@ -589,7 +588,7 @@ main( int argc, char *argv[] )
        }
 
        /* LDAPv3 only */
-       version = 3;
+       version = LDAP_VERSION3;
        rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
 
        if(rc != LDAP_OPT_SUCCESS ) {

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 0b31d500cfa6758d90fb1c1a297665842de8e398..91cdda26e517ed25376bd25d25e45361e86f0b05 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -717,7 +717,7 @@ main( int argc, char **argv )
        }
 
        if (version == -1 ) {
-               version = 3;
+               version = LDAP_VERSION3;
        }
 
        if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version )
@@ -1291,7 +1291,9 @@ static int print_result(
        return err;
 }
 
-void print_ctrls( LDAPControl **ctrls ) {
+static void print_ctrls(
+       LDAPControl **ctrls )
+{
        int i;
        for(i=0; ctrls[i] != NULL; i++ ) {
                /* control: OID criticality base64value */