From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 9 Oct 2023 02:19:01 +0000 (+1300)
Subject: s4:kdc: Remove ‘claims_valid’ parameter from samba_kdc_add_claims_valid()
X-Git-Tag: tevent-0.16.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0038cc050b5dcda4f92779e014486d3b356ef33c;p=thirdparty%2Fsamba.git

s4:kdc: Remove ‘claims_valid’ parameter from samba_kdc_add_claims_valid()

It’s only ever equal to SAMBA_CLAIMS_VALID_INCLUDE.

View with ‘git show -b’.

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 96dffe533c7..0ce0f39be7e 100644
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -518,8 +518,7 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
 		return EINVAL;
 	}
 
-	nt_status = samba_kdc_add_claims_valid(SAMBA_CLAIMS_VALID_INCLUDE,
-					       user_info_dc_shallow_copy);
+	nt_status = samba_kdc_add_claims_valid(user_info_dc_shallow_copy);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DBG_ERR("Failed to add Claims Valid: %s\n",
 			nt_errstr(nt_status));
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index e3b84cc75c5..9b0b0cb5116 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -814,24 +814,14 @@ NTSTATUS samba_kdc_add_asserted_identity(enum samba_asserted_identity ai,
 		&user_info_dc->num_sids);
 }
 
-NTSTATUS samba_kdc_add_claims_valid(enum samba_claims_valid claims_valid,
-				    struct auth_user_info_dc *user_info_dc)
+NTSTATUS samba_kdc_add_claims_valid(struct auth_user_info_dc *user_info_dc)
 {
-	switch (claims_valid) {
-	case SAMBA_CLAIMS_VALID_EXCLUDE:
-		return NT_STATUS_OK;
-	case SAMBA_CLAIMS_VALID_INCLUDE:
-	{
-		return add_sid_to_array_attrs_unique(
-			user_info_dc,
-			&global_sid_Claims_Valid,
-			SE_GROUP_DEFAULT_FLAGS,
-			&user_info_dc->sids,
-			&user_info_dc->num_sids);
-	}
-	}
-
-	return NT_STATUS_INVALID_PARAMETER;
+	return add_sid_to_array_attrs_unique(
+		user_info_dc,
+		&global_sid_Claims_Valid,
+		SE_GROUP_DEFAULT_FLAGS,
+		&user_info_dc->sids,
+		&user_info_dc->num_sids);
 }
 
 NTSTATUS samba_kdc_add_compounded_auth(enum samba_compounded_auth compounded_auth,
@@ -2173,8 +2163,7 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
 		return KRB5KDC_ERR_TGT_REVOKED;
 	}
 
-	nt_status = samba_kdc_add_claims_valid(SAMBA_CLAIMS_VALID_INCLUDE,
-					       device_info_dc_shallow_copy);
+	nt_status = samba_kdc_add_claims_valid(device_info_dc_shallow_copy);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DBG_ERR("Failed to add Claims Valid: %s\n",
 			nt_errstr(nt_status));
@@ -3159,8 +3148,7 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
 			goto out;
 		}
 
-		nt_status = samba_kdc_add_claims_valid(SAMBA_CLAIMS_VALID_INCLUDE,
-						       device_info_shallow_copy);
+		nt_status = samba_kdc_add_claims_valid(device_info_shallow_copy);
 		if (!NT_STATUS_IS_OK(nt_status)) {
 			DBG_ERR("Failed to add Claims Valid: %s\n",
 				nt_errstr(nt_status));
diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index d36ac8d9645..8a280779f57 100644
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -40,11 +40,6 @@ enum samba_asserted_identity {
 	SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
 };
 
-enum samba_claims_valid {
-	SAMBA_CLAIMS_VALID_EXCLUDE = 0,
-	SAMBA_CLAIMS_VALID_INCLUDE,
-};
-
 enum samba_compounded_auth {
 	SAMBA_COMPOUNDED_AUTH_EXCLUDE = 0,
 	SAMBA_COMPOUNDED_AUTH_INCLUDE,
@@ -200,8 +195,7 @@ krb5_error_code samba_kdc_get_claims_data_from_db(struct ldb_context *samdb,
 NTSTATUS samba_kdc_add_asserted_identity(enum samba_asserted_identity ai,
 					 struct auth_user_info_dc *user_info_dc);
 
-NTSTATUS samba_kdc_add_claims_valid(enum samba_claims_valid claims_valid,
-				    struct auth_user_info_dc *user_info_dc);
+NTSTATUS samba_kdc_add_claims_valid(struct auth_user_info_dc *user_info_dc);
 
 NTSTATUS samba_kdc_add_compounded_auth(enum samba_compounded_auth compounded_auth,
 				       struct auth_user_info_dc *user_info_dc);
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 08680b53154..7ef6cd4f543 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -156,8 +156,7 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
 		return map_errno_from_nt_status(nt_status);
 	}
 
-	nt_status = samba_kdc_add_claims_valid(SAMBA_CLAIMS_VALID_INCLUDE,
-					       user_info_dc_shallow_copy);
+	nt_status = samba_kdc_add_claims_valid(user_info_dc_shallow_copy);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DBG_ERR("Failed to add Claims Valid: %s\n",
 			nt_errstr(nt_status));