From 122f2b318f77229873aa98e608726421b62beeac Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Sun, 21 Nov 2004 14:30:39 +0000
Subject: [PATCH] 	Make "use_tunneled_reply" work for MS-CHAPv2

---
 src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index 8529b75..d95771a 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -630,18 +630,6 @@ static int process_reply(EAP_HANDLER *handler, tls_session_t *tls_session,
 			 */
 			pairmove2(&vp, &reply->vps, PW_EAP_MESSAGE);
 			pairfree(&vp);
-
-			/*
-			 *	If we've been told to use the attributes from
-			 *	the reply, then do so.
-			 *
-			 *	WARNING: This may leak information about the
-			 *	tunneled user!
-			 */
-			if (t->use_tunneled_reply) {
-				pairadd(&request->reply->vps, reply->vps);
-				reply->vps = NULL;
-			}
 		}
 
 		/*
@@ -652,6 +640,18 @@ static int process_reply(EAP_HANDLER *handler, tls_session_t *tls_session,
 			vp2diameter(tls_session, vp);
 			pairfree(&vp);
 		}
+
+		/*
+		 *	If we've been told to use the attributes from
+		 *	the reply, then do so.
+		 *
+		 *	WARNING: This may leak information about the
+		 *	tunneled user!
+		 */
+		if (t->use_tunneled_reply) {
+			pairadd(&request->reply->vps, reply->vps);
+			reply->vps = NULL;
+		}
 		break;
 
 
-- 
2.1.4