From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 10 Oct 2023 02:38:29 +0000 (+1300)
Subject: s4:kdc: Pass claims and device info into samba_kdc_check_s4u2proxy_rbcd()
X-Git-Tag: tevent-0.16.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4dbaecfe5678c3270cf71b97d8abda78bc91ff;p=thirdparty%2Fsamba.git

s4:kdc: Pass claims and device info into samba_kdc_check_s4u2proxy_rbcd()

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

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index f8535fade87..89de751f616 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -3375,6 +3375,8 @@ krb5_error_code samba_kdc_check_s4u2proxy_rbcd(
 		krb5_const_principal client_principal,
 		krb5_const_principal server_principal,
 		const struct auth_user_info_dc *user_info_dc,
+		const struct auth_user_info_dc *device_info_dc,
+		const struct auth_claims auth_claims,
 		struct samba_kdc_entry *proxy_skdc_entry)
 {
 	krb5_error_code code;
@@ -3460,8 +3462,8 @@ krb5_error_code samba_kdc_check_s4u2proxy_rbcd(
 						 kdc_db_ctx->lp_ctx,
 						 kdc_db_ctx->samdb,
 						 user_info_dc,
-						 NULL /*device_info_dc */,
-						 (struct auth_claims) {},
+						 device_info_dc,
+						 auth_claims,
 						 session_info_flags,
 						 &security_token);
 	if (!NT_STATUS_IS_OK(nt_status)) {
diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index b570029f573..fb74726b40c 100644
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -96,6 +96,8 @@ krb5_error_code samba_kdc_check_s4u2proxy_rbcd(
 		krb5_const_principal client_principal,
 		krb5_const_principal server_principal,
 		const struct auth_user_info_dc *user_info_dc,
+		const struct auth_user_info_dc *device_info_dc,
+		const struct auth_claims auth_claims,
 		struct samba_kdc_entry *proxy_skdc_entry);
 
 NTSTATUS samba_kdc_setup_db_ctx(TALLOC_CTX *mem_ctx, struct samba_kdc_base_context *base_ctx,
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index eea4fd90b8e..48151c582d6 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -370,6 +370,8 @@ hdb_samba4_check_rbcd(krb5_context context, HDB *db,
 					      client->principal,
 					      server_principal,
 					      client_info,
+					      NULL /* device_info_dc */,
+					      (struct auth_claims) {},
 					      proxy_skdc_entry);
 out:
 	talloc_free(mem_ctx);
diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index a3904a4d75d..2da054cb84e 100644
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -863,6 +863,8 @@ krb5_error_code mit_samba_check_allowed_to_delegate_from(
 					      client_principal,
 					      server_principal,
 					      user_info_dc,
+					      NULL /* device_info_dc */,
+					      (struct auth_claims) {},
 					      proxy_skdc_entry);
 out:
 	talloc_free(mem_ctx);