From af4a7c0f4be4bb94d6299e93f22d26e2f8340e69 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 19 Feb 2010 11:14:15 +1100 Subject: s4:winbind Make the 'no SID found' message even more detailed Now we give the user a clue as to what may be wrong, and the file path that we could not find the domain SID in. Andrew Bartlett --- source4/param/secrets.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source4/param') diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 18a0800779..407e27ff67 100644 --- 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; -- cgit