Add ‘type’ pair to EAP method files

diff --git a/src/tests/auth/unit_test_module.conf b/src/tests/auth/unit_test_module.conf
index ab058933136ed8ef756ec5d9297b3ba0a5fc3302..2d822e7a37b7f12b37c8b09a4236f84985facc53 100644 (file)
--- a/src/tests/auth/unit_test_module.conf
+++ b/src/tests/auth/unit_test_module.conf
@@ -26,7 +26,7 @@ modules {
 }
 
 server default {
-       recv Access-Request {
+       authorize {
                update control {
                        Cleartext-Password := 'hello'
                }
@@ -42,7 +42,7 @@ server default {
                pap
        }
 
-       process Access-Request {
+       authenticate {
                digest
                pap
                chap

diff --git a/src/tests/eapol_test/config/methods-available/gtc b/src/tests/eapol_test/config/methods-available/gtc
index 7c19445bbff06ce3a3be5aaf8a52726257c849ca..f1d9afb29ce2cf123dca0853a797f41d0b020cd7 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/gtc
+++ b/src/tests/eapol_test/config/methods-available/gtc
@@ -1,3 +1,4 @@
+type = gtc
 gtc {
        auth_type = PAP
 }

diff --git a/src/tests/eapol_test/config/methods-available/leap b/src/tests/eapol_test/config/methods-available/leap
index 798a5d015f9ea345354ba502ed9258a7449fcc32..128f277c428509d4c987ee8a4ed1b0c2d9edce57 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/leap
+++ b/src/tests/eapol_test/config/methods-available/leap
@@ -1,2 +1,4 @@
+type = leap
+
 leap {
 }

diff --git a/src/tests/eapol_test/config/methods-available/md5 b/src/tests/eapol_test/config/methods-available/md5
index b6c7c395411e72f21091349fd2155650d1c46f61..9007215e65beb76fad25ca749c9b73951cd7357c 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/md5
+++ b/src/tests/eapol_test/config/methods-available/md5
@@ -1,2 +1,4 @@
+type = md5
+
 md5 {
 }

diff --git a/src/tests/eapol_test/config/methods-available/mschapv2 b/src/tests/eapol_test/config/methods-available/mschapv2
index e45a6ed77b9c990e8f56d498222fe71ab0dac413..1d30bc570c4cd8ce434987c1d9c7b7a0a94d999b 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/mschapv2
+++ b/src/tests/eapol_test/config/methods-available/mschapv2
@@ -1,3 +1,5 @@
+type = mschapv2
+
 #
 #  This takes no configuration.
 #

diff --git a/src/tests/eapol_test/config/methods-available/pwd b/src/tests/eapol_test/config/methods-available/pwd
index 5dfd59cb53fef54014ba88f94af6c6e549623342..c2618881cf54cf90fffaf3c20841ef09f068970b 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/pwd
+++ b/src/tests/eapol_test/config/methods-available/pwd
@@ -1,3 +1,5 @@
+type = pwd
+
 pwd {
        group = 19
 

diff --git a/src/tests/eapol_test/config/methods-available/tls b/src/tests/eapol_test/config/methods-available/tls
index d6d4c70820b5da3a8b80950b69a45fa56b9747a6..e18211ec1b3750abb19a8986f75afafa4b937b59 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/tls
+++ b/src/tests/eapol_test/config/methods-available/tls
@@ -1,3 +1,5 @@
+type = tls
+
 tls {
        # Point to the common TLS configuration
        tls = tls-common

diff --git a/src/tests/eapol_test/config/methods-available/ttls b/src/tests/eapol_test/config/methods-available/ttls
index 7498caa367892206facd316251a729af37b2b4a1..33bb29d0ae94624f5a7ef329dc43afb3d84490d4 100644 (file)
--- a/src/tests/eapol_test/config/methods-available/ttls
+++ b/src/tests/eapol_test/config/methods-available/ttls
@@ -1,3 +1,4 @@
+type = ttls
 
 ## EAP-TTLS
 #