From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 14 Oct 2019 17:19:06 +0000 (-0400)
Subject: set default_eap_type in methods-enabled file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72f539b58192b86cbcdc74777f5903b6aa35ba5a;p=thirdparty%2Ffreeradius-server.git

set default_eap_type in methods-enabled file

It's not quite normal, but it is fine.
---

diff --git a/src/tests/eapol_test/config/aka/methods-enabled/aka b/src/tests/eapol_test/config/aka/methods-enabled/aka
index 796894973ee..da4fd3ac8ea 100644
--- a/src/tests/eapol_test/config/aka/methods-enabled/aka
+++ b/src/tests/eapol_test/config/aka/methods-enabled/aka
@@ -1,4 +1,5 @@
 type = aka
+default_eap_type = aka
 
 aka {
 	network_name = "testing123"
diff --git a/src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime b/src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime
index c51d140b007..6c9d89fc403 100644
--- a/src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime
+++ b/src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime
@@ -1,4 +1,5 @@
 type = aka_prime
+default_eap_type = aka_prime
 
 aka_prime {
 	network_name = "testing123"
diff --git a/src/tests/eapol_test/config/gtc/methods-enabled/gtc b/src/tests/eapol_test/config/gtc/methods-enabled/gtc
index 5d89529c03f..1cf8907cb0e 100644
--- a/src/tests/eapol_test/config/gtc/methods-enabled/gtc
+++ b/src/tests/eapol_test/config/gtc/methods-enabled/gtc
@@ -1,4 +1,6 @@
 type = gtc
+default_eap_type = gtc
+
 gtc {
 	auth_type = pap
 }
diff --git a/src/tests/eapol_test/config/md5/methods-enabled/md5 b/src/tests/eapol_test/config/md5/methods-enabled/md5
index 9007215e65b..2d122d01502 100644
--- a/src/tests/eapol_test/config/md5/methods-enabled/md5
+++ b/src/tests/eapol_test/config/md5/methods-enabled/md5
@@ -1,4 +1,5 @@
 type = md5
+default_eap_type = md5
 
 md5 {
 }
diff --git a/src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2 b/src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2
index 1d30bc570c4..33b48f0c5e1 100644
--- a/src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2
+++ b/src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2
@@ -1,4 +1,5 @@
 type = mschapv2
+default_eap_type = mschapv2
 
 #
 #  This takes no configuration.
diff --git a/src/tests/eapol_test/config/peap/methods-enabled/peap b/src/tests/eapol_test/config/peap/methods-enabled/peap
index a5087ec6376..663f5f576f0 100644
--- a/src/tests/eapol_test/config/peap/methods-enabled/peap
+++ b/src/tests/eapol_test/config/peap/methods-enabled/peap
@@ -1,4 +1,5 @@
 type = peap
+default_eap_type = peap
 
 peap {
 	#  Which tls-config section the TLS negotiation parameters
diff --git a/src/tests/eapol_test/config/pwd/methods-enabled/pwd b/src/tests/eapol_test/config/pwd/methods-enabled/pwd
index c2618881cf5..a22b927a284 100644
--- a/src/tests/eapol_test/config/pwd/methods-enabled/pwd
+++ b/src/tests/eapol_test/config/pwd/methods-enabled/pwd
@@ -1,4 +1,5 @@
 type = pwd
+default_eap_type = pwd
 
 pwd {
 	group = 19
diff --git a/src/tests/eapol_test/config/servers.conf b/src/tests/eapol_test/config/servers.conf
index 3819b95f255..b9831987c24 100644
--- a/src/tests/eapol_test/config/servers.conf
+++ b/src/tests/eapol_test/config/servers.conf
@@ -60,7 +60,9 @@ modules {
 	$-INCLUDE ${testdir}/$ENV{METHOD}/mods-enabled/
 
 	eap {
-		default_eap_type = $ENV{METHOD}
+		#
+		#  default_eap_type is set in the method file
+		#
 		ignore_unknown_eap_types = no
 		cisco_accounting_username_bug = no
 
diff --git a/src/tests/eapol_test/config/sim/methods-enabled/sim b/src/tests/eapol_test/config/sim/methods-enabled/sim
index 57f5e2c8245..bf2f1831fca 100644
--- a/src/tests/eapol_test/config/sim/methods-enabled/sim
+++ b/src/tests/eapol_test/config/sim/methods-enabled/sim
@@ -1,4 +1,5 @@
 type = sim
+default_eap_type = sim
 
 sim {
 	virtual_server = "eap-sim"
diff --git a/src/tests/eapol_test/config/tls/methods-enabled/tls b/src/tests/eapol_test/config/tls/methods-enabled/tls
index e18211ec1b3..d7bfc979515 100644
--- a/src/tests/eapol_test/config/tls/methods-enabled/tls
+++ b/src/tests/eapol_test/config/tls/methods-enabled/tls
@@ -1,4 +1,5 @@
 type = tls
+default_eap_type = tls
 
 tls {
 	# Point to the common TLS configuration
diff --git a/src/tests/eapol_test/config/ttls/methods-enabled/ttls b/src/tests/eapol_test/config/ttls/methods-enabled/ttls
index 33bb29d0ae9..5719e345641 100644
--- a/src/tests/eapol_test/config/ttls/methods-enabled/ttls
+++ b/src/tests/eapol_test/config/ttls/methods-enabled/ttls
@@ -1,4 +1,5 @@
 type = ttls
+default_eap_type = ttls
 
 ## EAP-TTLS
 #