From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 12 Dec 2024 09:21:56 +0000 (+0000)
Subject: Set vic_options in module instantiation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbeb18df229c5e7d5136980228cc3762c8de1c43;p=thirdparty%2Ffreeradius-server.git

Set vic_options in module instantiation

Only needs to be set once, and `inst` is protected after instantiation.
---

diff --git a/src/modules/rlm_krb5/krb5.c b/src/modules/rlm_krb5/krb5.c
index 55e99b4d892..9baf5b6ab43 100644
--- a/src/modules/rlm_krb5/krb5.c
+++ b/src/modules/rlm_krb5/krb5.c
@@ -143,8 +143,6 @@ void *krb5_mod_conn_create(TALLOC_CTX *ctx, void *instance, UNUSED fr_time_delta
 	krb5_verify_opt_set_secure(&conn->options, true);
 
 	if (inst->service) krb5_verify_opt_set_service(&conn->options, inst->service);
-#else
-	krb5_verify_init_creds_opt_set_ap_req_nofail(inst->vic_options, true);
 #endif
 	return conn;
 
diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 033f6148c21..c76267f6b92 100644
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -216,6 +216,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 	MEM(inst->vic_options = talloc_zero(inst, krb5_verify_init_creds_opt));
 	krb5_verify_init_creds_opt_init(inst->vic_options);
+	krb5_verify_init_creds_opt_set_ap_req_nofail(inst->vic_options, true);
 #endif
 
 #ifdef KRB5_IS_THREAD_SAFE