From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 10 Feb 2021 13:30:11 +0000 (-0500)
Subject: use the v4 dictionary format
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f213e933066ff08a78ff6b0eb77ffa7f928f94c;p=thirdparty%2Ffreeradius-server.git

use the v4 dictionary format

remove BEGIN-TLV.

Failover-DNS-Removal-Info is a *group*, not a TLV.
The DHCPv6 number space is global.  So option 117 must be
defined globally, even if it can only occur inside of
attribute 116.
---

diff --git a/share/dictionary/dhcpv6/dictionary.rfc5678 b/share/dictionary/dhcpv6/dictionary.rfc5678
index ec6aa4e2b64..257319d5a20 100644
--- a/share/dictionary/dhcpv6/dictionary.rfc5678
+++ b/share/dictionary/dhcpv6/dictionary.rfc5678
@@ -12,17 +12,12 @@
 ##############################################################################
 
 ATTRIBUTE	MOD-Address-List			54	tlv
-
-BEGIN-TLV	MOD-Address-List
-ATTRIBUTE	IS					1	ipv6addr array
-ATTRIBUTE	CS					2	ipv6addr array
-ATTRIBUTE	ES					3	ipv6addr array
-END-TLV		MOD-Address-List
+ATTRIBUTE	IS					.1	ipv6addr array
+ATTRIBUTE	CS					.2	ipv6addr array
+ATTRIBUTE	ES					.3	ipv6addr array
 
 ATTRIBUTE	MOS-Domain-Name-List			55	tlv
+ATTRIBUTE	IS					.1	string dns_label,array
+ATTRIBUTE	CS					.2	string dns_label,array
+ATTRIBUTE	ES					.3	string dns_label,array
 
-BEGIN-TLV	MOS-Domain-Name-List
-ATTRIBUTE	IS					1	string dns_label,array
-ATTRIBUTE	CS					2	string dns_label,array
-ATTRIBUTE	ES					3	string dns_label,array
-END-TLV		MOS-Domain-Name-List
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5908 b/share/dictionary/dhcpv6/dictionary.rfc5908
index 670fc6bdaf9..f74351c04d3 100644
--- a/share/dictionary/dhcpv6/dictionary.rfc5908
+++ b/share/dictionary/dhcpv6/dictionary.rfc5908
@@ -11,8 +11,6 @@
 ##############################################################################
 
 ATTRIBUTE	NTP-Server				56	tlv
-BEGIN-TLV	NTP-Server
-ATTRIBUTE	Address					1	ipv6addr
-ATTRIBUTE	Multicast-Address			2	ipv6addr
-ATTRIBUTE	FQDN					3	string dns_label
-END-TLV		NTP-Server
+ATTRIBUTE	Address					.1	ipv6addr
+ATTRIBUTE	Multicast-Address			.2	ipv6addr
+ATTRIBUTE	FQDN					.3	string dns_label
diff --git a/share/dictionary/dhcpv6/dictionary.rfc8156 b/share/dictionary/dhcpv6/dictionary.rfc8156
index d6b6aac9912..48d7caf7706 100644
--- a/share/dictionary/dhcpv6/dictionary.rfc8156
+++ b/share/dictionary/dhcpv6/dictionary.rfc8156
@@ -23,9 +23,12 @@ VALUE	Failover-Binding-Status		Reset			8
 ATTRIBUTE	Failover-Connect-Flags			115	uint16
 VALUE	Failover-Connect-Flags		Fixed-PD-Length		1
 
-ATTRIBUTE	Failover-DNS-Removal-Info		116	tlv
+ATTRIBUTE	Failover-DNS-Removal-Info		116	group
 
-BEGIN-TLV	Failover-DNS-Removal-Info
+#
+#  The next 3 attributes can only occur inside of Failover-DNS-Removal-Info.
+#  However, in DHCPv6, the attribute number space is global.
+#
 ATTRIBUTE	Host-Name				117	string dns_label
 ATTRIBUTE	Zone-Name				118	string dns_label
 
@@ -34,7 +37,7 @@ VALUE	Flags				Fwd-Up-To-Date		0x01
 VALUE	Flags				Rev-Up-To-Date		0x02
 VALUE	Flags				Synthesized-Name	0x04
 VALUE	Flags				Using-Requested-FQDN	0x08
-END-TLV		Failover-DNS-Removal-Info
+
 
 ATTRIBUTE	Failover-Expiration-Time		120	date
 ATTRIBUTE	Failover-Max-Unacked-BNDUPD		121	uint32