s4:winbind Make the 'no SID found' message even more detailed

[abartlet/samba.git/.git] / source4 / param / secrets.c

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 18a08007796a91e916ea63f3f6d54d0a25b423ba..407e27ff670edae95e96b348b2364434505348da 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -165,12 +165,15 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
                              attrs, 0, SECRETS_PRIMARY_DOMAIN_FILTER, domain);
 
        if (ldb_ret != LDB_SUCCESS) {
-               *errstring = talloc_asprintf(mem_ctx, "Failed to find record for %s in secrets.ldb: %s: %s", domain, ldb_strerror(ldb_ret), ldb_errstring(ldb));
+               *errstring = talloc_asprintf(mem_ctx, "Failed to find record for %s in %s: %s: %s", 
+                                            domain, ldb_get_opaque(ldb, "ldb_url"), 
+                                            ldb_strerror(ldb_ret), ldb_errstring(ldb));
                return NULL;
        }
        v = ldb_msg_find_ldb_val(msg, "objectSid");
        if (v == NULL) {
-               *errstring = talloc_asprintf(mem_ctx, "Failed to find a SID on record for %s in secrets.ldb", domain);
+               *errstring = talloc_asprintf(mem_ctx, "Failed to find a SID on record for %s in %s", 
+                                            domain, ldb_get_opaque(ldb, "ldb_url"));
                return NULL;
        }
        result = talloc(mem_ctx, struct dom_sid);
@@ -182,7 +185,8 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
        ndr_err = ndr_pull_struct_blob(v, result, NULL, result,
                                       (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               *errstring = talloc_asprintf(mem_ctx, "Failed to parse SID on record for %s in secrets.ldb", domain);
+               *errstring = talloc_asprintf(mem_ctx, "Failed to parse SID on record for %s in %s", 
+                                            domain, ldb_get_opaque(ldb, "ldb_url"));
                talloc_free(result);
                talloc_free(ldb);
                return NULL;