From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 9 Dec 2020 14:47:38 +0000 (-0500)
Subject: revert to working version
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6de95ef6c89eb1fa428decf32f91447ca82f74f;p=thirdparty%2Ffreeradius-server.git

revert to working version

until such time as we fix the code
---

diff --git a/share/dictionary/dhcpv6/dictionary.rfc3315 b/share/dictionary/dhcpv6/dictionary.rfc3315
index b4fb1b1bbaa..8c24d9ea4ed 100644
--- a/share/dictionary/dhcpv6/dictionary.rfc3315
+++ b/share/dictionary/dhcpv6/dictionary.rfc3315
@@ -32,17 +32,15 @@ MEMBER		Enterprise-Number			uint32
 MEMBER		Identifier				octets
 
 STRUCT	LL				DUID			3
-MEMBER		Hardware-Type				uint16 key,clone=Client-ID.DUID.LLT.Hardware-Type
+MEMBER		Hardware-Type				uint16 key
+
+#  Sub-struct of Client-ID.LL.Hardware-Type
+STRUCT	Ethernet			Hardware-Type		1
+MEMBER		Address					ether
 
 #
 #  Server-ID is a clone of Client-ID
 #
-#  Note that the cloning happens after all of the DHCPv6 dictionaries
-#  have been loaded.  This delay allows multiple dictionaries to
-#  define sub-structures for Client-ID.  Once all of the
-#  sub-structures have been defined, the Server-ID option can clone
-#  all of those sub-structures.
-#
 ATTRIBUTE	Server-ID				2	struct clone=Client-ID
 
 ATTRIBUTE	IA-NA					3	struct