From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Wed, 27 Sep 2023 03:52:59 +0000 (+1300)
Subject: s4:kdc: Remove ‘asserted_identity’ parameter from samba_kdc_get_user_info_dc()
X-Git-Tag: tevent-0.16.0~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68dc69d86f16f73a55647e54c4d59f5cdf9c9494;p=thirdparty%2Fsamba.git

s4:kdc: Remove ‘asserted_identity’ parameter from samba_kdc_get_user_info_dc()

It was not used.

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

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index 2646190fe99..4067e06dc61 100644
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -486,7 +486,6 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
 
 	nt_status = samba_kdc_get_user_info_dc(tmp_ctx,
 					       skdc_entry,
-					       SAMBA_ASSERTED_IDENTITY_IGNORE,
 					       &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 0b9c58db6b7..861a6c2efe0 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1098,7 +1098,6 @@ NTSTATUS samba_kdc_get_claims_blob(TALLOC_CTX *mem_ctx,
 
 NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
 				    struct samba_kdc_entry *skdc_entry,
-				    enum samba_asserted_identity asserted_identity,
 				    struct auth_user_info_dc **user_info_dc_out)
 {
 	NTSTATUS nt_status;
@@ -1120,15 +1119,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
 		return nt_status;
 	}
 
-	/* Here we modify the SIDs to add the Asserted Identity SID. */
-	nt_status = samba_kdc_add_asserted_identity(asserted_identity,
-						    user_info_dc);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		DBG_ERR("Failed to add asserted identity: %s\n",
-			nt_errstr(nt_status));
-		return nt_status;
-	}
-
 	*user_info_dc_out = user_info_dc;
 
 	return NT_STATUS_OK;
@@ -1215,7 +1205,6 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx,
 		 */
 		nt_status = samba_kdc_get_user_info_dc(mem_ctx,
 						       skdc_entry,
-						       SAMBA_ASSERTED_IDENTITY_IGNORE,
 						       &user_info_dc);
 		if (!NT_STATUS_IS_OK(nt_status)) {
 			DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@@ -2025,7 +2014,6 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
 
 	nt_status = samba_kdc_get_user_info_dc(frame,
 					       device,
-					       SAMBA_ASSERTED_IDENTITY_IGNORE,
 					       &device_info_dc);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@@ -2942,7 +2930,6 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
 	} else {
 		nt_status = samba_kdc_get_user_info_dc(frame,
 						       device,
-						       SAMBA_ASSERTED_IDENTITY_IGNORE,
 						       &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 7fe7f050ac6..6ddd77ad312 100644
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -86,7 +86,6 @@ NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry,
 
 NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
 				    struct samba_kdc_entry *skdc_entry,
-				    enum samba_asserted_identity asserted_identity,
 				    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 f63453f81b4..1f3e3455c91 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -125,7 +125,6 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
 
 	nt_status = samba_kdc_get_user_info_dc(mem_ctx,
 					       skdc_entry,
-					       SAMBA_ASSERTED_IDENTITY_IGNORE,
 					       &user_info_dc);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		talloc_free(mem_ctx);