1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

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>
This commit is contained in:
Joseph Sutton 2023-10-03 12:33:25 +13:00 committed by Andrew Bartlett
parent 64326818eb
commit d51c505d35
2 changed files with 4 additions and 4 deletions

View File

@ -1126,7 +1126,7 @@ NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
NTSTATUS nt_status; NTSTATUS nt_status;
struct auth_user_info_dc *user_info_dc = NULL; 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; struct loadparm_context *lp_ctx = entry->kdc_db_ctx->lp_ctx;
nt_status = authsam_make_user_info_dc(entry, 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, msg,
data_blob_null, data_blob_null,
data_blob_null, data_blob_null,
&entry->user_info_dc); &entry->info_from_db);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("Getting user info for PAC failed: %s\n", DBG_ERR("Getting user info for PAC failed: %s\n",
nt_errstr(nt_status)); 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. */ /* 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)) { if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("Failed to allocate user_info_dc SIDs: %s\n", DBG_ERR("Failed to allocate user_info_dc SIDs: %s\n",
nt_errstr(nt_status)); nt_errstr(nt_status));

View File

@ -60,7 +60,7 @@ struct samba_kdc_entry {
const void *kdc_entry; /* this is a reference to hdb_entry/krb5_db_entry */ const void *kdc_entry; /* this is a reference to hdb_entry/krb5_db_entry */
struct ldb_message *msg; struct ldb_message *msg;
struct ldb_dn *realm_dn; 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_kerberos_client_policy *client_policy;
const struct authn_server_policy *server_policy; const struct authn_server_policy *server_policy;
bool is_krbtgt; bool is_krbtgt;