From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 7 Feb 2024 08:11:33 +0000 (+0000)
Subject: Remove protocol prefixes from attribute references
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de6789581739d351050e7b4ff6b79c6aaebfc63;p=thirdparty%2Ffreeradius-server.git

Remove protocol prefixes from attribute references
---

diff --git a/raddb/mods-available/sqlippool b/raddb/mods-available/sqlippool
index a655ef858a1..18b88197803 100644
--- a/raddb/mods-available/sqlippool
+++ b/raddb/mods-available/sqlippool
@@ -74,21 +74,21 @@ sqlippool {
 	#
 	#  For RADIUS the owner will likely be specified by:
 	#
-	#  * `%{radius.Calling-Station-Id}` which binds the lease to the mac address
+	#  * `%{Calling-Station-Id}` which binds the lease to the mac address
 	#    of the user's device.  For RADIUS this is almost always the better
 	#    option as it can allow the user's device to move between NAS.
 	#
-	#  * `%{radius.NAS-Port}` which binds the lease to a given port on the NAS.
+	#  * `%{NAS-Port}` which binds the lease to a given port on the NAS.
 	#    i.e. any device on that port can modify the lease.  This should only
 	#    be used when the port is constant for the length of the session
 	#    (nearly everywhere except 802.11 wireless).
 	#
 	#  For DHCPv4 the owner will likely be specified by:
 	#
-	#  * `%{dhcpv4.Client-Hardware-Address}` which binds the lease to the
+	#  * `%{Client-Hardware-Address}` which binds the lease to the
 	#    mac address of the user's device.
 	#
-	#  * `%{&dhcpv4.Client-Identifier || &dhcpv4.Client-Hardware-Address}`
+	#  * `%{&Client-Identifier || &Client-Hardware-Address}`
 	#    which binds the lease to either the custom identifier set by the
 	#    DHCP client, or if this is absent, the mac address of the user's
 	#    device.
@@ -110,11 +110,11 @@ sqlippool {
 	#  trusted attribute.
 	#  One example would be `%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}.%{Calling-Station-Id}`.`
 	#
-	owner = "%{radius.Calling-Station-ID}"
+	owner = "%{Calling-Station-ID}"
 
-#       owner = "%{radius.Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}.%{radius.Calling-Station-Id}"
+#       owner = "%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}.%{Calling-Station-Id}"
 
-#	owner = "%{&dhcpv4.Client-Identifier || &dhcpv4.Client-Hardware-Address}"
+#	owner = "%{&Client-Identifier || &Client-Hardware-Address}"
 
 	#
 	#  requested_address:: The IP address being renewed or released.
@@ -140,9 +140,9 @@ sqlippool {
 	#  For DHCPv4, this device is recorded so that we can respond correctly
 	#  to lease queries.
 	#
-	gateway = "%{&radius.NAS-Identifier || &radius.NAS-IP-Address}"
+	gateway = "%{&NAS-Identifier || &NAS-IP-Address}"
 
-#       gateway = "%{dhcpv4.Gateway-IP-Address}"
+#       gateway = "%{Gateway-IP-Address}"
 
 	#
 	#  .Load the queries from a separate file.