From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 24 Feb 2016 13:25:49 +0000 (-0500)
Subject: Only normal attributes are treated specially.  Fixes #1544
X-Git-Tag: release_3_0_12~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fceb137507087e08877ce011e31a3afebbd58be7;p=thirdparty%2Ffreeradius-server.git

Only normal attributes are treated specially.  Fixes #1544
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 967bb424c0b..6c885da2a77 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -1254,7 +1254,7 @@ static int CC_HINT(nonnull) setup_fake_request(REQUEST *request, REQUEST *fake,
 			/*
 			 *	Some attributes are handled specially.
 			 */
-			switch (vp->da->attr) {
+			if (!vp->da->vendor) switch (vp->da->attr) {
 				/*
 				 *	NEVER copy Message-Authenticator,
 				 *	EAP-Message, or State.  They're
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 83eaf0cf325..912060f0a60 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -1117,7 +1117,7 @@ int eapttls_process(eap_handler_t *handler, tls_session_t *tls_session)
 			/*
 			 *	Some attributes are handled specially.
 			 */
-			switch (vp->da->attr) {
+			if (!vp->da->vendor) switch (vp->da->attr) {
 			/*
 			 *	NEVER copy Message-Authenticator,
 			 *	EAP-Message, or State.  They're