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 796894973eeef65877e6b32c17c60da097c45e54..da4fd3ac8ea60817714294965b663c6cd5037df2 100644 (file)
--- 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 c51d140b0078906dc33b8fbb7ca211c31933ce0d..6c9d89fc403195a50609c0216f14bcd27f306f43 100644 (file)
--- 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 5d89529c03fe1856d46ee08fffefc1285ead167a..1cf8907cb0e033cd98ecd34c7968b63865842fe8 100644 (file)
--- 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 9007215e65beb76fad25ca749c9b73951cd7357c..2d122d015026420c732239822fec3d75d824387c 100644 (file)
--- 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 1d30bc570c4cd8ce434987c1d9c7b7a0a94d999b..33b48f0c5e1355a980b63d5702d16ef406ab4d50 100644 (file)
--- 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 a5087ec63761edffb0e60783cc3c0eb38c09b1b1..663f5f576f048de6ed2b68957868e001f4a82ea5 100644 (file)
--- 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 c2618881cf54cf90fffaf3c20841ef09f068970b..a22b927a284a569090834fca2598737ebb0a94b3 100644 (file)
--- 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 3819b95f255fcdce409c319a7c50e7fbdc3e6b05..b9831987c244ae17e5500e16555b6ce5f457d3f6 100644 (file)
--- 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 57f5e2c82458256be647826178c5257cc86cac8b..bf2f1831fcaa3d88fd91c5a48584f9c933f906d3 100644 (file)
--- 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 e18211ec1b3750abb19a8986f75afafa4b937b59..d7bfc979515415c8db31595d8ad66e8d764b9c24 100644 (file)
--- 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 33bb29d0ae94624f5a7ef329dc43afb3d84490d4..5719e345641347a7ea6e0916c8e4b88af86dc717 100644 (file)
--- 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
 #