From ed9bacc1a6156e33b55ed8e86669bb99ee5e6a77 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 16 Jan 2001 04:32:13 +0000 Subject: [PATCH] Change start tls warning message --- clients/tools/ldapdelete.c | 3 +-- clients/tools/ldapmodify.c | 3 +-- clients/tools/ldapmodrdn.c | 3 +-- clients/tools/ldappasswd.c | 3 +-- clients/tools/ldapsearch.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 2bbb3c826f..4bcd7923b5 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -546,11 +546,10 @@ main( int argc, char **argv ) } if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { + ldap_perror( ld, "ldap_start_tls" ); if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); return EXIT_FAILURE; } - fprintf( stderr, "WARNING: could not start TLS\n" ); } if (want_bindpw) { diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 3851ad550d..181a6e656f 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -616,11 +616,10 @@ main( int argc, char **argv ) } if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { + ldap_perror( ld, "ldap_start_tls" ); if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); return( EXIT_FAILURE ); } - fprintf( stderr, "WARNING: could not start TLS\n" ); } if (want_bindpw) { diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 3ab276dc33..547f20e369 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -583,11 +583,10 @@ main(int argc, char **argv) } if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { + ldap_perror( ld, "ldap_start_tls" ); if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); return( EXIT_FAILURE ); } - fprintf( stderr, "WARNING: could not start TLS\n" ); } if (want_bindpw) { diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index 667d10ec39..8f42c016fd 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -597,11 +597,10 @@ main( int argc, char *argv[] ) } if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { + ldap_perror( ld, "ldap_start_tls" ); if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); return( EXIT_FAILURE ); } - fprintf( stderr, "WARNING: could not start TLS\n" ); } if ( authmethod == LDAP_AUTH_SASL ) { diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 28571422cd..a4b0738f9f 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -733,11 +733,10 @@ main( int argc, char **argv ) if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { + ldap_perror( ld, "ldap_start_tls" ); if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); return EXIT_FAILURE; } - fprintf( stderr, "WARNING: could not start TLS\n" ); } if (want_bindpw) { -- 2.39.5