From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 4 Mar 2019 02:15:43 +0000 (+1300)
Subject: dsdb: Provide better error strings in rootdse GUID attribute handling
X-Git-Tag: talloc-2.2.0~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f2558cab8113fd22800e41d46ede1465884f80b;p=thirdparty%2Fsamba.git

dsdb: Provide better error strings in rootdse GUID attribute handling

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index c5849818411..55340fa4f1e 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -515,7 +515,21 @@ static int rootdse_add_dynamic(struct rootdse_context *ac, struct ldb_message *m
 					    DSDB_SEARCH_SHOW_EXTENDED_DN,
 					    ac->req);
 		if (ret != LDB_SUCCESS) {
-			return ldb_operr(ldb);
+			DBG_WARNING("Failed to convert GUID into full DN in rootDSE for %s: %s: %s\n",
+				    guid_attrs[i],
+				    ldb_dn_get_extended_linearized(ac, attr_dn, 1),
+				    ldb_errstring(ldb));
+			/*
+			 * Provide a meaninful error string but not
+			 * confidential DB contents possibly in the
+			 * original string
+			 */
+			ldb_asprintf_errstring(ldb,
+					       "Failed to find full DN for %s: %s",
+					       guid_attrs[i],
+					       ldb_dn_get_extended_linearized(ac, attr_dn, 1));
+			/* Overstamp the error code, it would confuse the caller */
+			return LDB_ERR_OPERATIONS_ERROR;
 		}
 
 		el = ldb_msg_find_element(msg, guid_attrs[i]);