peap/eap change in 3.0.x with inner_eap_module now required

[Matthew Newton]

On Tue, Jan 19, 2016 at 09:25:56PM +0000, Matthew Newton wrote:
> Rather than hard-coding "eap", does it make sense to do the attached patch?
> (Haven't tested it here.)

List stripping...


>From 36056d82fd92306f0809635e747ca70fc26bf2b4 Mon Sep 17 00:00:00 2001
From: Matthew Newton <mcn4 at leicester.ac.uk>
Date: Tue, 19 Jan 2016 21:23:00 +0000
Subject: [PATCH] use instantiation name

---
 src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index e43c9c7..f1a2d49 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -125,7 +125,9 @@ static int mod_instantiate(CONF_SECTION *cs, void **instance)
 	/*
 	 *	Don't expose this if we don't need it.
 	 */
-	if (!inst->inner_eap_module) inst->inner_eap_module = "eap";
+	if (!inst->inner_eap_module) {
+		inst->inner_eap_module = cf_section_name(cs);
+	}
 
 	dv = dict_valbyname(PW_AUTH_TYPE, 0, inst->inner_eap_module);
 	if (!dv) {
-- 
2.1.4


-- 
Matthew Newton, Ph.D. <mcn4 at le.ac.uk>

Systems Specialist, Infrastructure Services,
I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom

For IT help contact helpdesk extn. 2253, <ithelp at le.ac.uk>