From f02b5d87a561ba669bd368a8a6422f364f7702ec Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Sat, 5 Mar 2011 23:11:21 +0000
Subject: [PATCH] 3063.	[contrib]	More verbose error reporting from DLZ
 LDAP. [RT #23402]

---
 CHANGES                               |  2 ++
 contrib/dlz/drivers/dlz_ldap_driver.c | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7973d33ce3..2ababacfcb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3063.	[contrib]	More verbose error reporting from DLZ LDAP. [RT #23402]
+
 3062.	[func]		Made several changes to enhance human readability
 			of DNSSEC data in dig output and in generated
 			zone files:
diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c
index 77422baee4..6d08285447 100644
--- a/contrib/dlz/drivers/dlz_ldap_driver.c
+++ b/contrib/dlz/drivers/dlz_ldap_driver.c
@@ -507,16 +507,32 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char ** attrs,
 				result = dns_sdlz_putnamedrr(
 						(dns_sdlzallnodes_t *) ptr,
 						host, type, ttl, data);
-		}
-		else
+			if (result != ISC_R_SUCCESS)
+				isc_log_write(dns_lctx,
+					DNS_LOGCATEGORY_DATABASE,
+					DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
+					"dlz-ldap: putnamedrr failed "
+					"for \"%s %s %u %s\", %s",
+					host, type, ttl, data,
+					isc_result_totext(result));
+		} else {
 			result = dns_sdlz_putrr((dns_sdlzlookup_t *) ptr,
 						type, ttl, data);
+			if (result != ISC_R_SUCCESS)
+				isc_log_write(dns_lctx,
+					DNS_LOGCATEGORY_DATABASE,
+					DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
+					"dlz-ldap: putrr failed "
+					"for \"%s %u %s\", %s",
+					type, ttl, data,
+					isc_result_totext(result));
+		}
 
 		if (result != ISC_R_SUCCESS) {
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 				      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
 				      "LDAP driver failed "
-				      "while sending data to Bind.");
+				      "while sending data to BIND.");
 			goto cleanup;
 		}