dsdb: Use attribute-name parameter for error message

We'll reuse this code for working out the msDS-ResultantPSO, so
references to 'tokenGroups' in error messages would be misleading.

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 576cf8615740e27ec6704b77db8f891bc0dae553..3fe61edcfd1cfa0afc6c97d5ca6a18f5eb48e074 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -249,8 +249,9 @@ static int construct_generic_token_groups(struct ldb_module *module,
                                           tmp_ctx, &groupSIDs, &num_groupSIDs);
 
        if (!NT_STATUS_IS_OK(status)) {
-               ldb_asprintf_errstring(ldb, "Failed to construct tokenGroups: expanding groups of SID %s failed: %s",
-                                      account_sid_string, nt_errstr(status));
+               ldb_asprintf_errstring(ldb, "Failed to construct %s: expanding groups of SID %s failed: %s",
+                                      attribute_string, account_sid_string,
+                                      nt_errstr(status));
                talloc_free(tmp_ctx);
                return LDB_ERR_OPERATIONS_ERROR;
        }
@@ -264,8 +265,9 @@ static int construct_generic_token_groups(struct ldb_module *module,
        status = dsdb_expand_nested_groups(ldb, &primary_group_blob, false, filter,
                                           tmp_ctx, &groupSIDs, &num_groupSIDs);
        if (!NT_STATUS_IS_OK(status)) {
-               ldb_asprintf_errstring(ldb, "Failed to construct tokenGroups: expanding groups of SID %s failed: %s",
-                                      account_sid_string, nt_errstr(status));
+               ldb_asprintf_errstring(ldb, "Failed to construct %s: expanding groups of SID %s failed: %s",
+                                      attribute_string, account_sid_string,
+                                      nt_errstr(status));
                talloc_free(tmp_ctx);
                return LDB_ERR_OPERATIONS_ERROR;
        }