Port fix for use_tunneled_reply from 1.1.x

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 f0f130e..853a383 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
@@ -175,6 +175,7 @@ static int eappeap_authenticate(void *arg, EAP_HANDLER *handler)
        eaptls_status_t status;
        rlm_eap_peap_t *inst = (rlm_eap_peap_t *) arg;
        tls_session_t *tls_session = (tls_session_t *) handler->opaque;
+       peap_tunnel_t *peap = NULL;
 
        DEBUG2("  rlm_eap_peap: Authenticate");
 
@@ -268,12 +269,12 @@ static int eappeap_authenticate(void *arg, EAP_HANDLER *handler)
                 *      Move the saved VP's from the Access-Accept to
                 *      our Access-Accept.
                 */
-               if (((peap_tunnel_t *) tls_session->opaque)->accept_vps) {
+               peap = tls_session->opaque;
+               if (peap->accept_vps) {
                        DEBUG2("  Using saved attributes from the original Access-Accept");
                }
-               pairadd(&handler->request->reply->vps,
-                       ((peap_tunnel_t *) tls_session->opaque)->accept_vps);
-               ((peap_tunnel_t *) tls_session->opaque)->accept_vps = NULL;
+               pairmove(&handler->request->reply->vps, &peap->accept_vps);
+               pairfree(&peap->accept_vps);
 
                eaptls_gen_mppe_keys(&handler->request->reply->vps,
                                     tls_session->ssl,