From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 17 Mar 2022 11:55:02 +0000 (-0400)
Subject: move RFC 2610 options to their own file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579976e82aa6bfb97fcf86e51154717f77135229;p=thirdparty%2Ffreeradius-server.git

move RFC 2610 options to their own file
---

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index 7535d6e4ee8..f60b711ad4b 100644
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -23,6 +23,7 @@ $INCLUDE dictionary.freeradius.internal
 
 # Fixme should be broken out into separate RFCs
 $INCLUDE dictionary.rfc2131
+$INCLUDE dictionary.rfc2610
 $INCLUDE dictionary.rfc4280
 $INCLUDE dictionary.rfc4578
 $INCLUDE dictionary.rfc4776
diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index 2a9f5f9e372..b0bab52ecc4 100644
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -139,10 +139,7 @@ ATTRIBUTE	StreetTalk-Server-Address		75	ipaddr array
 ATTRIBUTE	STDA-Server-Address			76	ipaddr array
 # User Class Information
 ATTRIBUTE	User-Class				77	octets
-# directory agent information
-ATTRIBUTE	Directory-Agent				78	octets
-# service location agent scope
-ATTRIBUTE	Service-Scope				79	octets
+
 # Rapid Commit
 ATTRIBUTE	Rapid-Commit				80	bool
 # Fully Qualified Domain Name
diff --git a/share/dictionary/dhcpv4/dictionary.rfc2610 b/share/dictionary/dhcpv4/dictionary.rfc2610
new file mode 100644
index 00000000000..1fa7ad2f43a
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc2610
@@ -0,0 +1,21 @@
+# -*- text -*-
+# Copyright (C) 2022 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+# Version $Id$
+##############################################################################
+#
+#  RFC2610 - DHCP Options for Service Location Protocol
+#
+#  $Id$
+#
+##############################################################################
+
+# directory agent information
+ATTRIBUTE	Directory-Agent				78	struct
+MEMBER		Mandatory				uint8
+MEMBER		Agent					ipaddr	array
+
+# service location agent scope
+ATTRIBUTE	Service-Scope				79	struct
+MEMBER		Mandatory				uint8
+MEMBER		Scope-List				string # space-separated set of strings