From: James Rouzier <jrouzier@inverse.ca>
Date: Tue, 13 Sep 2016 14:57:37 +0000 (-0400)
Subject: use eap_fast_decode_vp convert tlv to a value pair
X-Git-Tag: release_3_0_12~74^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6f2bdef117969fdf13f49fcdcee8f86e82366e5;p=thirdparty%2Ffreeradius-server.git

use eap_fast_decode_vp convert tlv to a value pair
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
index 9489a9f44c0..abb66520a0f 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
@@ -646,26 +646,23 @@ VALUE_PAIR *eap_fast_fast2vp(REQUEST *request, SSL *ssl, uint8_t const *data, si
 		 *
 		 * For now, if it doesn't exist, ignore it.
 		 */
-        da = dict_attrbyparent(fast_da, attr, 0);
-		if (!da) goto next_attr;
-
+		da = dict_attrbyparent(fast_da, attr, fast_da->vendor);
+		if (!da) {
+			RDEBUG("eap_fast_fast2vp: no sub attribute found %s attr: %u vendor: %u",
+					fast_da->name, attr, fast_da->vendor);
+			goto next_attr;
+		}
 		if (da->type == PW_TYPE_TLV) {
 			eap_fast_fast2vp(request, ssl, data, length, da, out);
 			goto next_attr;
 		}
-/*
-ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dict_attr_t const *parent,
-				    uint8_t const *data, size_t const attr_len, size_t const packet_len,
-				    void *decoder_ctx)
-
-        vp = NULL;
-        decoded = rad_attr2vp(request->packet, NULL, NULL, NULL,
-                      data, size + 2, &vp);
+		decoded = eap_fast_decode_vp(request, da, data, length, &vp);
 		if (decoded < 0) {
 			RERROR("Failed decoding %s: %s", da->name, fr_strerror());
 			goto next_attr;
 		}
-*/
+
+		fr_cursor_merge(out, vp);
 
 	next_attr:
 		while (fr_cursor_next(out)) {