From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 18 Jan 2016 14:22:05 +0000 (-0500)
Subject: Make inner EAP name configurable
X-Git-Tag: release_3_0_11~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae5c27f484eaf831781e5858fe4deda25a6f640;p=thirdparty%2Ffreeradius-server.git

Make inner EAP name configurable
---

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 1cf7a737e3f..6ac49a65dc7 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
@@ -31,6 +31,7 @@ typedef struct rlm_eap_peap_t {
 	char const *default_method_name;	//!< Default tunneled EAP type.
 	int default_method;
 
+	char const *inner_eap_module;		//!< module name for inner EAP
 	int auth_type_eap;
 	bool use_tunneled_reply;		//!< Use the reply attributes from the tunneled session in
 						//!< the non-tunneled reply to the client.
@@ -54,6 +55,8 @@ static CONF_PARSER module_config[] = {
 
 	{ "default_eap_type", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_eap_peap_t, default_method_name), "mschapv2" },
 
+	{ "inner_eap_module", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_eap_peap_t, inner_eap_module), "eap" },
+
 	{ "copy_request_to_tunnel", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, rlm_eap_peap_t, copy_request_to_tunnel), "no" },
 
 	{ "use_tunneled_reply", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, rlm_eap_peap_t, use_tunneled_reply), "no" },
@@ -119,12 +122,14 @@ static int mod_instantiate(CONF_SECTION *cs, void **instance)
 		return -1;
 	}
 
-	dv = dict_valbyname(PW_AUTH_TYPE, 0, "mschap");
-	if (!dv) dv = dict_valbyname(PW_AUTH_TYPE, 0, "MS-CHAP");
+
+	dv = dict_valbyname(PW_AUTH_TYPE, 0, inst->inner_eap_module);
 	if (!dv) {
-		cf_log_err_cs(cs, "Failed to find 'Auth-Type mschap' section.  Cannot authenticate users.");
+		cf_log_err_cs(cs, "Failed to find 'Auth-Type %s' section.  Cannot authenticate users.",
+			      inst->inner_eap_module);
 		return -1;
 	}
+
 	inst->auth_type_eap = dv->value;
 	return 0;
 }