Move EAP types (sub-modules) to use talloc

[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 97e990e..1eb2807 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -51,7 +51,6 @@ static const CONF_PARSER module_config[] = {
 static int eap_detach(void *instance)
 {
        rlm_eap_t *inst;
-       int i;
 
        inst = (rlm_eap_t *)instance;
 
@@ -65,11 +64,6 @@ static int eap_detach(void *instance)
        inst->session_tree = NULL;
        eaplist_free(inst);
 
-       for (i = 0; i < PW_EAP_MAX_TYPES; i++) {
-               if (inst->types[i]) eaptype_free(inst->types[i]);
-               inst->types[i] = NULL;
-       }
-
        return 0;
 }
 
@@ -191,10 +185,12 @@ static int eap_instantiate(CONF_SECTION *cs, void **instance)
                 *      Load the type.
                 */
                if (eaptype_load(&inst->types[eap_type], eap_type, scs) < 0) {
+                       talloc_steal(inst, inst->types[eap_type]);
                        eap_detach(inst);
                        return -1;
                }
 
+               talloc_steal(inst, inst->types[eap_type]);
                num_types++;    /* successfully loaded one more types */
        }