From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 9 Oct 2023 05:19:36 +0000 (+1300)
Subject: s4:kdc: Have samba_kdc_allowed_to_authenticate_to() take claims and device info
X-Git-Tag: tevent-0.16.0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cef5de95afe8627c1137d2c8124fdaccfd31eac;p=thirdparty%2Fsamba.git

s4:kdc: Have samba_kdc_allowed_to_authenticate_to() take claims and device info

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

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index aa2a556539b..5d1995f986c 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1699,6 +1699,8 @@ krb5_error_code samba_kdc_allowed_to_authenticate_to(TALLOC_CTX *mem_ctx,
 						     struct loadparm_context *lp_ctx,
 						     const struct samba_kdc_entry *client,
 						     const struct auth_user_info_dc *client_info,
+						     const struct auth_user_info_dc *device_info,
+						     const struct auth_claims auth_claims,
 						     const struct samba_kdc_entry *server,
 						     struct authn_audit_info **server_audit_info_out,
 						     NTSTATUS *status_out)
@@ -1750,8 +1752,8 @@ krb5_error_code samba_kdc_allowed_to_authenticate_to(TALLOC_CTX *mem_ctx,
 						      lp_ctx,
 						      AUTHN_POLICY_AUTH_TYPE_KERBEROS,
 						      client_info,
-						      NULL /* device_info */,
-						      (struct auth_claims) {},
+						      device_info,
+						      auth_claims,
 						      server_policy,
 						      (struct authn_policy_flags) {},
 						      server_audit_info_out);
@@ -2589,6 +2591,8 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
 							    lp_ctx,
 							    auth_entry.entry,
 							    auth_user_info_dc,
+							    NULL /* device_info */,
+							    (struct auth_claims) {},
 							    server,
 							    server_audit_info_out,
 							    status_out);
diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index d1b30c5213e..0c7a879515a 100644
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -159,6 +159,8 @@ krb5_error_code samba_kdc_allowed_to_authenticate_to(TALLOC_CTX *mem_ctx,
 						     struct loadparm_context *lp_ctx,
 						     const struct samba_kdc_entry *client,
 						     const struct auth_user_info_dc *client_info,
+						     const struct auth_user_info_dc *device_info,
+						     const struct auth_claims auth_claims,
 						     const struct samba_kdc_entry *server,
 						     struct authn_audit_info **server_audit_info_out,
 						     NTSTATUS *status_out);
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 7ef6cd4f543..9d49ffc655d 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -173,6 +173,8 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
 							   server_entry->kdc_db_ctx->lp_ctx,
 							   skdc_entry,
 							   user_info_dc_shallow_copy,
+							   NULL /* device_info */,
+							   (struct auth_claims) {},
 							   server_entry,
 							   &server_audit_info,
 							   &reply_status);