sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

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

Browse Source 
It was not used.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-09-27 16:18:56 +13:00 committed by Joseph Sutton
parent cfeb3d75cb
commit f250a24e92
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/kdc/mit_samba.c
View File

@ -487,7 +487,6 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
nt_status = samba_kdc_get_user_info_dc(tmp_ctx, nt_status = samba_kdc_get_user_info_dc(tmp_ctx,
skdc_entry, skdc_entry,
asserted_identity, asserted_identity,
SAMBA_CLAIMS_VALID_EXCLUDE,
&user_info_dc); &user_info_dc);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);

12
source4/kdc/pac-glue.c
View File

@ -1099,7 +1099,6 @@ NTSTATUS samba_kdc_get_claims_blob(TALLOC_CTX *mem_ctx,
NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx, NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
struct samba_kdc_entry *skdc_entry, struct samba_kdc_entry *skdc_entry,
enum samba_asserted_identity asserted_identity, enum samba_asserted_identity asserted_identity,
enum samba_claims_valid claims_valid,
struct auth_user_info_dc **user_info_dc_out) struct auth_user_info_dc **user_info_dc_out)
{ {
NTSTATUS nt_status; NTSTATUS nt_status;
@ -1130,14 +1129,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
return nt_status; return nt_status;
} }
nt_status = samba_kdc_add_claims_valid(claims_valid,
user_info_dc);
if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("Failed to add Claims Valid: %s\n",
nt_errstr(nt_status));
return nt_status;
}
*user_info_dc_out = user_info_dc; *user_info_dc_out = user_info_dc;
return NT_STATUS_OK; return NT_STATUS_OK;
@ -1225,7 +1216,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, nt_status = samba_kdc_get_user_info_dc(mem_ctx,
skdc_entry, skdc_entry,
SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
SAMBA_CLAIMS_VALID_EXCLUDE,
&user_info_dc); &user_info_dc);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@ -2027,7 +2017,6 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
nt_status = samba_kdc_get_user_info_dc(frame, nt_status = samba_kdc_get_user_info_dc(frame,
device, device,
SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
SAMBA_CLAIMS_VALID_EXCLUDE,
&device_info_dc); &device_info_dc);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@ -2936,7 +2925,6 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
nt_status = samba_kdc_get_user_info_dc(frame, nt_status = samba_kdc_get_user_info_dc(frame,
device, device,
SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY, SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
SAMBA_CLAIMS_VALID_EXCLUDE,
&device_info); &device_info);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n", DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",

1
source4/kdc/pac-glue.h
View File

@ -87,7 +87,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, NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
struct samba_kdc_entry *skdc_entry, struct samba_kdc_entry *skdc_entry,
enum samba_asserted_identity asserted_identity, enum samba_asserted_identity asserted_identity,
enum samba_claims_valid claims_valid,
struct auth_user_info_dc **user_info_dc_out); struct auth_user_info_dc **user_info_dc_out);
krb5_error_code samba_kdc_map_policy_err(NTSTATUS nt_status); krb5_error_code samba_kdc_map_policy_err(NTSTATUS nt_status);

1
source4/kdc/wdc-samba4.c
View File

@ -126,7 +126,6 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
nt_status = samba_kdc_get_user_info_dc(mem_ctx, nt_status = samba_kdc_get_user_info_dc(mem_ctx,
skdc_entry, skdc_entry,
asserted_identity, asserted_identity,
SAMBA_CLAIMS_VALID_EXCLUDE,
&user_info_dc); &user_info_dc);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(mem_ctx); talloc_free(mem_ctx);