From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 5 Aug 2006 16:34:19 +0000 (+0000)
Subject: make log messages more esplicative
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~30
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd8e1bb522c696aa6bc11336e47697982c5d64ac;p=openldap

make log messages more esplicative
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 43cc60c1bb..a0a4080e7f 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1435,8 +1435,8 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb, int version )
 	if ( rc ) {
 		Debug( LDAP_DEBUG_ANY,
 			"slap_client_connect: "
-			"TLS context initialization failed\n",
-			0, 0, 0 );
+			"URI=%s TLS context initialization failed (%d)\n",
+			sb->sb_uri.bv_val, rc, 0 );
 		return rc;
 	}
 #endif
@@ -1446,11 +1446,12 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb, int version )
 		rc = ldap_start_tls_s( ld, NULL, NULL );
 		if ( rc != LDAP_SUCCESS ) {
 			Debug( LDAP_DEBUG_ANY,
-				"slap_client_connect: "
+				"slap_client_connect: URI=%s "
 				"%s, ldap_start_tls failed (%d)\n",
+				sb->sb_uri.bv_val,
 				sb->sb_tls == SB_TLS_CRITICAL ?
 					"Error" : "Warning",
-				rc, 0 );
+				rc );
 			if ( sb->sb_tls == SB_TLS_CRITICAL ) {
 				goto done;
 			}
@@ -1499,9 +1500,9 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb, int version )
 		if ( rc != LDAP_SUCCESS ) {
 			static struct berval bv_GSSAPI = BER_BVC( "GSSAPI" );
 
-			Debug( LDAP_DEBUG_ANY, "slap_client_connect: "
+			Debug( LDAP_DEBUG_ANY, "slap_client_connect: URI=%s "
 				"ldap_sasl_interactive_bind_s failed (%d)\n",
-				rc, 0, 0 );
+				sb->sb_uri.bv_val, rc, 0 );
 
 			/* FIXME (see above comment) */
 			/* if Kerberos credentials cache is not active, retry */
@@ -1527,7 +1528,9 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb, int version )
 			&sb->sb_cred, NULL, NULL, NULL );
 		if ( rc != LDAP_SUCCESS ) {
 			Debug( LDAP_DEBUG_ANY, "slap_client_connect: "
-				"ldap_sasl_bind_s failed (%d)\n", rc, 0, 0 );
+				"URI=%s DN=\"%s\" "
+				"ldap_sasl_bind_s failed (%d)\n",
+				sb->sb_uri.bv_val, sb->sb_binddn.bv_val, rc );
 			goto done;
 		}
 	}