From 1469c19b74f17cb341be606f005afadc4a8bf224 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Tue, 4 Apr 2023 12:54:08 +1200 Subject: [PATCH] s4:kdc: Remove unused parameter Signed-off-by: Joseph Sutton Reviewed-by: Andreas Schneider --- source4/kdc/db-glue.c | 2 +- source4/kdc/mit_samba.c | 3 +-- source4/kdc/pac-glue.c | 7 +++---- source4/kdc/pac-glue.h | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index f80334db1fd..08941b9296a 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -1407,7 +1407,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context, * and computers should never be members of Protected Users, or * they may fail to authenticate. */ - status = samba_kdc_get_user_info_from_db(mem_ctx, p, msg, &user_info_dc); + status = samba_kdc_get_user_info_from_db(p, msg, &user_info_dc); if (!NT_STATUS_IS_OK(status)) { ret = EINVAL; goto out; diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c index a1615063258..a2e2a794a03 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -1064,8 +1064,7 @@ int mit_samba_kpasswd_change_password(struct mit_samba_context *ctx, return ENOMEM; } - status = samba_kdc_get_user_info_from_db(tmp_ctx, - p, + status = samba_kdc_get_user_info_from_db(p, p->msg, &user_info_dc); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 5448207cad0..5e7e87a54fe 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -1203,8 +1203,7 @@ static NTSTATUS samba_add_compounded_auth(TALLOC_CTX *mem_ctx, * structure. If the resulting structure is not talloc_free()d, it will be * reused on future calls to this function. */ -NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx, - struct samba_kdc_entry *skdc_entry, +NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry, const struct ldb_message *msg, const struct auth_user_info_dc **user_info_dc) { @@ -1422,7 +1421,7 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx, NTSTATUS nt_status; const struct auth_user_info_dc *user_info_dc = NULL; - nt_status = samba_kdc_get_user_info_from_db(mem_ctx, skdc_entry, skdc_entry->msg, &user_info_dc); + nt_status = samba_kdc_get_user_info_from_db(skdc_entry, skdc_entry->msg, &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { DBG_ERR("Getting user info for PAC failed: %s\n", nt_errstr(nt_status)); @@ -2317,7 +2316,7 @@ krb5_error_code samba_kdc_verify_pac(TALLOC_CTX *mem_ctx, goto done; } - nt_status = samba_kdc_get_user_info_from_db(mem_ctx, client, client->msg, &user_info_dc); + nt_status = samba_kdc_get_user_info_from_db(client, client->msg, &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { DBG_ERR("Getting user info for PAC failed: %s\n", nt_errstr(nt_status)); diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h index b0f02ac230c..f6fe6f5974c 100644 --- a/source4/kdc/pac-glue.h +++ b/source4/kdc/pac-glue.h @@ -77,8 +77,7 @@ int samba_krbtgt_is_in_db(struct samba_kdc_entry *skdc_entry, bool *is_in_db, bool *is_trusted); -NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx, - struct samba_kdc_entry *skdc_entry, +NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry, const struct ldb_message *msg, const struct auth_user_info_dc **user_info_dc);