From e0a3dd54992003c7cf07338d11f59728b425ebaa Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Wed, 27 Sep 2023 16:12:50 +1300 Subject: [PATCH] =?utf8?q?s4:kdc:=20Remove=20=E2=80=98compounded=5Fauth?= =?utf8?q?=E2=80=99=20parameter=20from=20samba=5Fkdc=5Fget=5Fuser=5Finfo?= =?utf8?q?=5Fdc()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It was never used. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- source4/kdc/mit_samba.c | 1 - source4/kdc/pac-glue.c | 12 ------------ source4/kdc/pac-glue.h | 1 - source4/kdc/wdc-samba4.c | 1 - 4 files changed, 15 deletions(-) diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c index ec2a4431078..9b2483f5f2a 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -488,7 +488,6 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx, skdc_entry, asserted_identity, SAMBA_CLAIMS_VALID_INCLUDE, - SAMBA_COMPOUNDED_AUTH_EXCLUDE, &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { talloc_free(tmp_ctx); diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 4c78647841e..bde24550265 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -1100,7 +1100,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx, struct samba_kdc_entry *skdc_entry, enum samba_asserted_identity asserted_identity, enum samba_claims_valid claims_valid, - enum samba_compounded_auth compounded_auth, struct auth_user_info_dc **user_info_dc_out) { NTSTATUS nt_status; @@ -1139,14 +1138,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx, return nt_status; } - nt_status = samba_kdc_add_compounded_auth(compounded_auth, - user_info_dc); - if (!NT_STATUS_IS_OK(nt_status)) { - DBG_ERR("Failed to add Compounded Authentication: %s\n", - nt_errstr(nt_status)); - return nt_status; - } - *user_info_dc_out = user_info_dc; return NT_STATUS_OK; @@ -1235,7 +1226,6 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx, skdc_entry, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_CLAIMS_VALID_EXCLUDE, - SAMBA_COMPOUNDED_AUTH_EXCLUDE, &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", @@ -2038,7 +2028,6 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx, device, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_CLAIMS_VALID_INCLUDE, - SAMBA_COMPOUNDED_AUTH_EXCLUDE, &device_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", @@ -2939,7 +2928,6 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx, device, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_CLAIMS_VALID_INCLUDE, - SAMBA_COMPOUNDED_AUTH_EXCLUDE, &device_info); if (!NT_STATUS_IS_OK(nt_status)) { DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h index 788803f0ad0..f7cf0b5c30a 100644 --- a/source4/kdc/pac-glue.h +++ b/source4/kdc/pac-glue.h @@ -88,7 +88,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx, struct samba_kdc_entry *skdc_entry, enum samba_asserted_identity asserted_identity, enum samba_claims_valid claims_valid, - enum samba_compounded_auth compounded_auth, struct auth_user_info_dc **user_info_dc_out); krb5_error_code samba_kdc_map_policy_err(NTSTATUS nt_status); diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index f0050a7e952..41fd32a852c 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -127,7 +127,6 @@ static krb5_error_code samba_wdc_get_pac(void *priv, skdc_entry, asserted_identity, SAMBA_CLAIMS_VALID_INCLUDE, - SAMBA_COMPOUNDED_AUTH_EXCLUDE, &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { talloc_free(mem_ctx); -- 2.47.3