Change start tls warning message

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 3851ad550d91cd2845fcee621c955533641aa72a..181a6e656f0347d9da272b456b57eb391c89157c 100644 (file)
--- 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 3ab276dc33608a2063ab46269ba9b2ba8baec8ed..547f20e3699d60a20eb303124491dbc9c6d4a2da 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 28571422cd0278d231ae8804a3d499502e67aeee..a4b0738f9f910df8782b5de4d2f929889a397b6f 100644 (file)
--- 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) {