From: Matthew Newton <mcn4@leicester.ac.uk>
Date: Sun, 8 Apr 2012 20:07:33 +0000 (+0100)
Subject: eap-tls is no longer required for ttls or peap
X-Git-Tag: release_3_0_0_beta0~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe513d56c5f75986b03c1ea7ba4e16e019d95f1d;p=thirdparty%2Ffreeradius-server.git

eap-tls is no longer required for ttls or peap
---

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 245cb0c7ecf..542202f7dc7 100644
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -191,18 +191,6 @@ static int eap_instantiate(CONF_SECTION *cs, void **instance)
 		}
 #endif
 
-		/*
-		 *	If we're asked to load TTLS or PEAP, ensure
-		 *	that we've first loaded TLS.
-		 */
-		if (((eap_type == PW_EAP_TTLS) ||
-		     (eap_type == PW_EAP_PEAP)) &&
-		    (inst->types[PW_EAP_TLS] == NULL)) {
-			radlog(L_ERR, "rlm_eap: Unable to load EAP-Type/%s, as EAP-Type/TLS is required first.",
-			       auth_type);
-			return -1;
-		}
-
 		/*
 		 *	Load the type.
 		 */