From d3549c4ab7351d311213ea0844dee5ecb2f40e87 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Thu, 23 Dec 2021 19:49:38 +1100 Subject: [PATCH] kdc: remove superflous request arg to _kdc_check_access() KDC_REQ is accessible as r->req --- kdc/kerberos5.c | 2 +- kdc/windc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index aad13f6d0..ab5eb0f78 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -2381,7 +2381,7 @@ _kdc_as_rep(astgs_request_t r) * with in a preauth mech. */ - ret = _kdc_check_access(r, req, &r->outpadata); + ret = _kdc_check_access(r, &r->outpadata); if(ret) goto out; diff --git a/kdc/windc.c b/kdc/windc.c index c9dd699bd..d386b4604 100644 --- a/kdc/windc.c +++ b/kdc/windc.c @@ -210,7 +210,7 @@ check(krb5_context context, const void *plug, void *plugctx, void *userctx) krb5_error_code -_kdc_check_access(astgs_request_t r, KDC_REQ *req, METHOD_DATA *method_data) +_kdc_check_access(astgs_request_t r, METHOD_DATA *method_data) { krb5_error_code ret = KRB5_PLUGIN_NO_HANDLE; struct check_uc uc; @@ -221,7 +221,7 @@ _kdc_check_access(astgs_request_t r, KDC_REQ *req, METHOD_DATA *method_data) uc.client_name = r->cname; uc.server_ex = r->server; uc.server_name = r->sname; - uc.req = req; + uc.req = &r->req; uc.method_data = method_data; ret = _krb5_plugin_run_f(r->context, &windc_plugin_data, @@ -229,7 +229,7 @@ _kdc_check_access(astgs_request_t r, KDC_REQ *req, METHOD_DATA *method_data) } if (ret == KRB5_PLUGIN_NO_HANDLE) - return kdc_check_flags(r, req->msg_type == krb_as_req, + return kdc_check_flags(r, r->req.msg_type == krb_as_req, r->client, r->server); return ret; }