From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 31 Mar 2022 14:29:35 +0000 (-0400)
Subject: the first 2 fields are mandatory, so we might as well define them :(
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d88895619229cb63ce5b699a661e2a577aa3539;p=thirdparty%2Ffreeradius-server.git

the first 2 fields are mandatory, so we might as well define them :(
---

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4174 b/share/dictionary/dhcpv4/dictionary.rfc4174
index 60efe8d3b7..542adb13a5 100644
--- a/share/dictionary/dhcpv4/dictionary.rfc4174
+++ b/share/dictionary/dhcpv4/dictionary.rfc4174
@@ -13,6 +13,7 @@
 
 # Internet Storage Name Service
 ATTRIBUTE	iSNS					83	struct
+
 # RFC 4174 describes the iSNS functions field as follows:
 #
 #                 0                   1         1
@@ -56,6 +57,7 @@ MEMBER		iSCSI-Initiator			bit[1]
 MEMBER		iSCSI-Target			bit[1]
 MEMBER		Control-Node			bit[1]
 MEMBER		DD-Access-Enabled		bit[1]
+
 #
 # The format of the Administrative Flags field:
 #
@@ -77,6 +79,7 @@ MEMBER		Default-Discovery-Domain	bit[1]
 MEMBER		Management-SCNs			bit[1]
 MEMBER		Heartbeat			bit[1]
 MEMBER		Administrative-Flags-Enabled	bit[1]
+
 #
 # The format of the Server Security bitmap:
 #
@@ -104,6 +107,7 @@ MEMBER		Aggressive-Mode			bit[1]
 MEMBER		Main-Mode			bit[1]
 MEMBER 		IKE/IPSec			bit[1]
 MEMBER		Server-Security-Enabled		bit[1]
+
 #
 # RFC 4174 describes the last portion of iSNS as follows:
 #
@@ -117,8 +121,11 @@ MEMBER		Server-Security-Enabled		bit[1]
 #   |                            . . . .                            |
 #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #
-# with the presence and semantics of a1-a4 and b1-b4 depending on
-# the setting of Heartbeat (see the Administrative Flags field above).
-# For now, we simply have an ipaddr array.
+#  with the presence and semantics of a1-a4 and b1-b4 depending on
+#  the setting of Heartbeat (see the Administrative Flags field above).
+#
+#  We really should have keyed unions here, but that's for a future version.
 #
-MEMBER		IP-Addresses			ipaddr array
+MEMBER		iSNS-Server-Heartbeat-Primary		ipaddr
+MEMBER		iSNS-Server-Primary-Secondary		ipaddr
+MEMBER		Secondary-iSNS-Server			ipaddr array