From: Ralf Haferkamp <ralf@openldap.org>
Date: Tue, 29 Sep 2009 17:19:28 +0000 (+0000)
Subject: print diagnostic messages when sasl_interactive_bind or start_tls_s failed
X-Git-Tag: ACLCHECK_0~202
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=42b870f9bbbd5da1a40ccc5f2323a5281effb34d;p=openldap

print diagnostic messages when sasl_interactive_bind or start_tls_s failed
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index d8fb6ac66f..aa7a0babab 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1311,7 +1311,10 @@ dnssrv_free:;
 		if ( use_tls ) {
 			rc = ldap_start_tls_s( ld, NULL, NULL );
 			if ( rc != LDAP_SUCCESS ) {
-				tool_perror( "ldap_start_tls", rc, NULL, NULL, NULL, NULL );
+				char *msg=NULL;
+				ldap_get_option( ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, (void*)&msg);
+				tool_perror( "ldap_start_tls", rc, NULL, NULL, msg, NULL );
+				ldap_memfree(msg);
 				if ( use_tls > 1 ) {
 					exit( EXIT_FAILURE );
 				}
@@ -1408,8 +1411,11 @@ tool_bind( LDAP *ld )
 
 		lutil_sasl_freedefs( defaults );
 		if( rc != LDAP_SUCCESS ) {
+			char *msg=NULL;
+			ldap_get_option( ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, (void*)&msg);
 			tool_perror( "ldap_sasl_interactive_bind_s",
-				rc, NULL, NULL, NULL, NULL );
+				rc, NULL, NULL, msg, NULL );
+			ldap_memfree(msg);
 			exit( rc );
 		}
 #else