From b63e4c9693a05590466c8431cf32eab9e29eed3f Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 13 Oct 2000 19:53:59 +0000 Subject: [PATCH] Import minor changes from devel --- clients/tools/ldapmodify.c | 2 +- clients/tools/ldappasswd.c | 3 +-- clients/tools/ldapsearch.c | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 2bb835a64e..50c05c4d01 100644 --- 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 2c9f5e868a..15ba0d20d8 100644 --- 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 0b31d500cf..91cdda26e5 100644 --- 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 */ -- 2.47.2