From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 3 Jun 2025 18:57:21 +0000 (-0400)
Subject: add Captive-Portal from RFC 8910 (old 3679)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e2c0d6fa0b5bb7d39dbedf6365a465398c92958;p=thirdparty%2Ffreeradius-server.git

add Captive-Portal from RFC 8910 (old 3679)
---

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index 0e3670670f7..a7f7967704a 100644
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -64,6 +64,7 @@ $INCLUDE dictionary.rfc7291
 $INCLUDE dictionary.rfc7710
 $INCLUDE dictionary.rfc7839
 $INCLUDE dictionary.rfc8357
+$INCLUDE dictionary.rfc8910
 $INCLUDE dictionary.rfc8925
 
 $INCLUDE dictionary.adsl_forum
diff --git a/share/dictionary/dhcpv4/dictionary.rfc3679 b/share/dictionary/dhcpv4/dictionary.rfc3679
index a48bddc9849..2df0ff5bd05 100644
--- a/share/dictionary/dhcpv4/dictionary.rfc3679
+++ b/share/dictionary/dhcpv4/dictionary.rfc3679
@@ -1,5 +1,5 @@
 # -*- text -*-
-# Copyright (C) 2022 The FreeRADIUS Server project and contributors
+# Copyright (C) 2025 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$
 ##############################################################################
@@ -25,5 +25,8 @@ ATTRIBUTE	LDAP					95	octets
 ATTRIBUTE	Netinfo-Address				112	octets
 # NetInfo Parent-Server Tag
 ATTRIBUTE	Netinfo-Tag				113	octets
-# URL
-ATTRIBUTE	URL					114	octets
+
+#
+#  Renamed. See RFC 8910
+#
+ALIAS		URL					Captive-Portal
diff --git a/share/dictionary/dhcpv4/dictionary.rfc8910 b/share/dictionary/dhcpv4/dictionary.rfc8910
new file mode 100644
index 00000000000..f9626e4d24f
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc8910
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2025 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$
+##############################################################################
+#
+#  RFC8910 -  Captive-Portal Identification in DHCP and Router Advertisements (RAs)
+#
+#  $Id$
+#
+##############################################################################
+
+#
+#  Also as URL in RFC3579.
+#
+ATTRIBUTE	Captive-Portal				114	octets