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 967bb424c0bb1de2780d874ee0ed875ef43dec39..6c885da2a77481cd6964dff9030c59b4c4d68ff5 100644 (file)
--- 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 83eaf0cf325da88af9833add8c8f082c76ff5b9e..912060f0a60bb2951ec5d06f6048e520ddbb6d0b 100644 (file)
--- 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