From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 2 Oct 2023 23:33:25 +0000 (+1300)
Subject: s4:kdc: Rename samba_kdc_entry::user_info_dc to samba_kdc_entry::info_from_db
X-Git-Tag: tevent-0.16.0~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d51c505d3554423d52e482d7313870366716b39d;p=thirdparty%2Fsamba.git

s4:kdc: Rename samba_kdc_entry::user_info_dc to samba_kdc_entry::info_from_db

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 3fd782adadc..f510ca1ef2c 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1126,7 +1126,7 @@ NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
 	NTSTATUS nt_status;
 	struct auth_user_info_dc *user_info_dc = NULL;
 
-	if (entry->user_info_dc == NULL) {
+	if (entry->info_from_db == NULL) {
 		struct loadparm_context *lp_ctx = entry->kdc_db_ctx->lp_ctx;
 
 		nt_status = authsam_make_user_info_dc(entry,
@@ -1138,7 +1138,7 @@ NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
 						      msg,
 						      data_blob_null,
 						      data_blob_null,
-						      &entry->user_info_dc);
+						      &entry->info_from_db);
 		if (!NT_STATUS_IS_OK(nt_status)) {
 			DBG_ERR("Getting user info for PAC failed: %s\n",
 				nt_errstr(nt_status));
@@ -1147,7 +1147,7 @@ NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
 	}
 
 	/* Make a shallow copy of the user_info_dc structure. */
-	nt_status = authsam_shallow_copy_user_info_dc(mem_ctx, entry->user_info_dc, &user_info_dc);
+	nt_status = authsam_shallow_copy_user_info_dc(mem_ctx, entry->info_from_db, &user_info_dc);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DBG_ERR("Failed to allocate user_info_dc SIDs: %s\n",
 			nt_errstr(nt_status));
diff --git a/source4/kdc/samba_kdc.h b/source4/kdc/samba_kdc.h
index 0cf762ab4d0..52ca4e81023 100644
--- a/source4/kdc/samba_kdc.h
+++ b/source4/kdc/samba_kdc.h
@@ -60,7 +60,7 @@ struct samba_kdc_entry {
 	const void *kdc_entry; /* this is a reference to hdb_entry/krb5_db_entry */
 	struct ldb_message *msg;
 	struct ldb_dn *realm_dn;
-	struct auth_user_info_dc *user_info_dc;
+	struct auth_user_info_dc *info_from_db;
 	const struct authn_kerberos_client_policy *client_policy;
 	const struct authn_server_policy *server_policy;
 	bool is_krbtgt;