Code Cleanup and new header inclusion.

[freeradius.git] / src / modules / rlm_eap / rlm_eap.c

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 7bb0b94..ef914b2 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -22,7 +22,8 @@
  */
 
 #include "autoconf.h"
-#include "eap.h"
+#include "rlm_eap.h"
+#include "modules.h"
 
 static CONF_PARSER module_config[] = {
        { "default_eap_type", PW_TYPE_STRING_PTR, offsetof(EAP_CONF, default_eap_type), NULL, "md5" },
@@ -51,26 +52,31 @@ static int eap_instantiate(CONF_SECTION *cs, void **instance)
        eap_stuff = (rlm_eap_t **)instance;
        types    = NULL;
        conf     = NULL;
-        auth_name = NULL;
+       auth_name = NULL;
 
        conf = (EAP_CONF *)malloc(sizeof(EAP_CONF));
        if (conf == NULL) {
                radlog(L_ERR, "rlm_eap: out of memory");
                return -1;
        }
-        if (cf_section_parse(cs, conf, module_config) < 0) {
-                free(conf);
-                return -1;
-        }
+       if (cf_section_parse(cs, conf, module_config) < 0) {
+               free(conf);
+               return -1;
+       }
+
+       for(scs=cf_subsection_find_next(cs, NULL, NULL);
+               scs != NULL;
+               scs=cf_subsection_find_next(cs, scs, NULL)) {
 
-        for(scs=cf_subsection_find_next(cs, NULL, NULL);
-                        scs != NULL;
-                        scs=cf_subsection_find_next(cs, scs, NULL)) {
-                auth_name = cf_section_name1(scs);
+               auth_name = cf_section_name1(scs);
 
-                if (!auth_name)  continue;
-               eaptype_load(&types, auth_name, scs);
-        }
+               if (!auth_name)  continue;
+
+               if (eaptype_load(&types, auth_name, scs) < 0) {
+                       free(conf);
+                       return -1;
+               }
+       }
 
        if (!types) {
                free(conf->default_eap_type);
@@ -201,7 +207,6 @@ static int eap_authenticate(void *instance, REQUEST *request)
                */
        }
 
-
        /*
         * Select the appropriate eap_type or default to the configured one
         */