From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 15 Aug 2021 20:37:30 +0000 (-0400)
Subject: dns labels have their own array decoder
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e19949df81b75c3f0dbb760d5764250dce158145;p=thirdparty%2Ffreeradius-server.git

dns labels have their own array decoder
---

diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index 378ee8ff56e..c95af9ce481 100644
--- a/src/protocols/dhcpv6/decode.c
+++ b/src/protocols/dhcpv6/decode.c
@@ -116,8 +116,6 @@ static ssize_t decode_value_trampoline(TALLOC_CTX *ctx, fr_dcursor_t *cursor, fr
 				       fr_dict_attr_t const *parent,
 				       uint8_t const *data, size_t const data_len, void *decode_ctx)
 {
-	if (parent->flags.array) return decode_array(ctx, cursor, dict, parent, data, data_len, decode_ctx);
-
 	/*
 	 *	@todo - we might need to limit this to only one DNS label.
 	 */
@@ -125,6 +123,8 @@ static ssize_t decode_value_trampoline(TALLOC_CTX *ctx, fr_dcursor_t *cursor, fr
 		return decode_dns_labels(ctx, cursor, dict, parent, data, data_len, decode_ctx);
 	}
 
+	if (parent->flags.array) return decode_array(ctx, cursor, dict, parent, data, data_len, decode_ctx);
+
 	return decode_value(ctx, cursor, dict, parent, data, data_len, decode_ctx);
 }