From b6fd71ae1c01e158c3ea0c14d4f41da8f493162d Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Fri, 30 Apr 2010 07:46:30 +0200 Subject: [PATCH] Use pairadd() properly. --- src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c | 4 ++-- src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 e244c8c..77c8058 100644 --- 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 @@ -315,8 +315,8 @@ static int eappeap_authenticate(void *arg, EAP_HANDLER *handler) peap = tls_session->opaque; if (peap->accept_vps) { RDEBUG2("Using saved attributes from the original Access-Accept"); - pairadd(&handler->request->reply->vps, &peap->accept_vps); - pairfree(&peap->accept_vps); + pairadd(&handler->request->reply->vps, peap->accept_vps); + peap->accept_vps = NULL; } /* diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c index 1a7775c..4a48887 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c @@ -213,8 +213,8 @@ static int eapttls_authenticate(void *arg, EAP_HANDLER *handler) if (t && t->authenticated) { if (t->accept_vps) { pairadd(&handler->request->reply->vps, - &t->accept_vps); - pairfree(&t->accept_vps); + t->accept_vps); + t->accept_vps = NULL; } do_keys: /* -- 2.1.4