From cf6b216868a4fcda79c618f2140bc2cb1e29064b Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Tue, 16 May 2023 17:03:44 +1200 Subject: [PATCH] kdc: Have caller pass HDB_F_FOR_TGS_REQ into _kdc_fast_check_armor_pac() We shall soon want to use this function for AS-REQs as well as TGS-REQs. Signed-off-by: Joseph Sutton --- kdc/fast.c | 4 +--- kdc/krb5tgs.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/kdc/fast.c b/kdc/fast.c index fd6c166ab..852cab4b8 100644 --- a/kdc/fast.c +++ b/kdc/fast.c @@ -835,10 +835,9 @@ _kdc_free_fast_state(KDCFastState *state) } krb5_error_code -_kdc_fast_check_armor_pac(astgs_request_t r) +_kdc_fast_check_armor_pac(astgs_request_t r, int flags) { krb5_error_code ret; - int flags; krb5_boolean ad_kdc_issued = FALSE; krb5_pac mspac = NULL; krb5_principal armor_client_principal = NULL; @@ -846,7 +845,6 @@ _kdc_fast_check_armor_pac(astgs_request_t r) hdb_entry *armor_client = NULL; char *armor_client_principal_name = NULL; - flags = HDB_F_FOR_TGS_REQ; if (_kdc_synthetic_princ_used_p(r->context, r->armor_ticket)) flags |= HDB_F_SYNTHETIC_OK; if (r->req.req_body.kdc_options.canonicalize) diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c index 6c1ec75e4..0f9e4ea3a 100644 --- a/kdc/krb5tgs.c +++ b/kdc/krb5tgs.c @@ -2017,7 +2017,7 @@ server_lookup: /* Validate armor TGT before potentially including device claims */ if (priv->armor_ticket) { - ret = _kdc_fast_check_armor_pac(priv); + ret = _kdc_fast_check_armor_pac(priv, HDB_F_FOR_TGS_REQ); if (ret) goto out; }