PEAP tunnel data should be parented by the tls_session not the handler

There's no need for explicit free functions

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index 99732cc..6ecd30f 100644 (file)
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -968,6 +968,8 @@ void pairmove(TALLOC_CTX *ctx, VALUE_PAIR **to, VALUE_PAIR **from)
  * Move pairs of a matching attribute number, vendor number and tag from the
  * the input list to the output list.
  *
+ * @note pairs which are moved have their parent changed to ctx.
+ *
  * @note pairfree should be called on the head of the old list to free unmoved
         attributes (if they're no longer needed).
  *

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index 3e44ebe..5e62c79 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -115,24 +115,6 @@ static int eappeap_attach(CONF_SECTION *cs, void **instance)
 }
 
 /*
- *     Free the PEAP per-session data
- */
-static void peap_free(void *p)
-{
-       peap_tunnel_t *t = (peap_tunnel_t *) p;
-
-       if (!t) return;
-
-       pairfree(&t->username);
-       pairfree(&t->state);
-       pairfree(&t->accept_vps);
-       pairfree(&t->soh_reply_vps);
-
-       talloc_free(t);
-}
-
-
-/*
  *     Allocate the PEAP per-session data
  */
 static peap_tunnel_t *peap_alloc(rlm_eap_peap_t *inst, eap_handler_t *handler)
@@ -252,8 +234,7 @@ static int mod_authenticate(void *arg, eap_handler_t *handler)
         *      allocate it if it doesn't already exist.
         */
        if (!tls_session->opaque) {
-               peap = tls_session->opaque = peap_alloc(inst, handler);
-               tls_session->free_opaque = peap_free;
+               peap = tls_session->opaque = peap_alloc(inst, tls_session);
        }
 
        status = eaptls_process(handler);
@@ -312,8 +293,7 @@ static int mod_authenticate(void *arg, eap_handler_t *handler)
         *      allocate it here, if it wasn't already alloacted.
         */
        if (!tls_session->opaque) {
-               tls_session->opaque = peap_alloc(inst, handler);
-               tls_session->free_opaque = peap_free;
+               tls_session->opaque = peap_alloc(inst, tls_session);
        }
 
        /*