From 2f3a8ae8d50a018e6040346a153db90090f24194 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Wed, 4 Oct 2023 16:31:41 +1300 Subject: [PATCH] =?utf8?q?s4:kdc:=20Remove=20=E2=80=98group=5Finclusion?= =?utf8?q?=E2=80=99=20parameter=20from=20samba=5Fkdc=5Fobtain=5Fuser=5Finf?= =?utf8?q?o=5Fdc()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It could be equal only to AUTH_EXCLUDE_RESOURCE_GROUPS. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- source4/kdc/pac-glue.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 40d4099633c..c061d1b6331 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -1182,7 +1182,6 @@ krb5_error_code samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx, static krb5_error_code samba_kdc_get_user_info_from_pac(TALLOC_CTX *mem_ctx, krb5_context context, struct ldb_context *samdb, - const enum auth_group_inclusion group_inclusion, const struct samba_kdc_entry_pac entry, struct auth_user_info_dc **info_out, const struct PAC_DOMAIN_GROUP_MEMBERSHIP **resource_groups_out) @@ -1216,7 +1215,7 @@ static krb5_error_code samba_kdc_get_user_info_from_pac(TALLOC_CTX *mem_ctx, frame = talloc_stackframe(); - if (resource_groups_out != NULL && group_inclusion == AUTH_EXCLUDE_RESOURCE_GROUPS) { + if (resource_groups_out != NULL) { /* * Since we are creating a TGT, resource groups from our domain * are not to be put into the PAC. Instead, we take the resource @@ -1272,7 +1271,6 @@ out: static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx, krb5_context context, struct ldb_context *samdb, - const enum auth_group_inclusion group_inclusion, const struct samba_kdc_entry_pac entry, struct auth_user_info_dc **info_out, const struct PAC_DOMAIN_GROUP_MEMBERSHIP **resource_groups_out) @@ -1290,7 +1288,6 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx, return samba_kdc_get_user_info_from_pac(mem_ctx, context, samdb, - group_inclusion, entry, info_out, resource_groups_out); @@ -2565,7 +2562,6 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx, code = samba_kdc_obtain_user_info_dc(tmp_ctx, context, samdb, - AUTH_EXCLUDE_RESOURCE_GROUPS, client, &user_info_dc, is_tgs ? &_resource_groups : NULL); @@ -2592,7 +2588,6 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx, code = samba_kdc_obtain_user_info_dc(tmp_ctx, context, samdb, - AUTH_EXCLUDE_RESOURCE_GROUPS, delegated_proxy, &auth_user_info_dc, NULL); -- 2.47.3