Update start tls error reporting

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 2bbb3c826f84ebf46f66714527455f0073e8a0bb..4bcd7923b5919cfcee1f0faf19766f1b9d6789e5 100644 (file)
--- 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 99b00da122bb6b84a1bf387e9b6a1c9039284d1b..48dd7f960cb23fcb94940fe9a2ebc40f8bd97ad2 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -612,11 +612,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 e4fbcc944867f7ce6a3090160af3325d04b5d5d1..f2de59185a4979640e21d2e47c9228a678c32a79 100644 (file)
--- 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 667d10ec39d880c43d15bbb7c410801d3ba4f931..8f42c016fdcd0f8a64aa95f140705093161160c3 100644 (file)
--- 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 a5557f58b6fb9ef151b877feb9e66b868e696d36..41f1cfc4248589705443c3ecb3922f43a6d6db51 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -729,11 +729,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) {