From: Nick Porter <nick@portercomputing.co.uk>
Date: Fri, 16 Feb 2024 17:20:21 +0000 (+0000)
Subject: There is no longer a DHCP specific sqlippool module
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=886841e075865e52f9eeb330c2e12deecaef057e;p=thirdparty%2Ffreeradius-server.git

There is no longer a DHCP specific sqlippool module
---

diff --git a/doc/antora/modules/raddb/nav.adoc b/doc/antora/modules/raddb/nav.adoc
index e0446924125..510297682e5 100644
--- a/doc/antora/modules/raddb/nav.adoc
+++ b/doc/antora/modules/raddb/nav.adoc
@@ -26,7 +26,6 @@
 *** xref:mods-available/detail.adoc[Detail Module]
 *** xref:mods-available/detail.example.com.adoc[Detail Module (Sample)]
 *** xref:mods-available/detail.log.adoc[Detail Module (Log Sample)]
-*** xref:mods-available/dhcp_sqlippool.adoc[DHCP SQL-IP-Pool Module]
 *** xref:mods-available/dhcpv4.adoc[DHCPv4 Module]
 *** xref:mods-available/dict.adoc[Dict Module]
 *** xref:mods-available/digest.adoc[Digest Module]
diff --git a/doc/antora/modules/raddb/pages/sites-available/dhcp.adoc b/doc/antora/modules/raddb/pages/sites-available/dhcp.adoc
index 9a8265df9ad..e82de992248 100644
--- a/doc/antora/modules/raddb/pages/sites-available/dhcp.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/dhcp.adoc
@@ -1,9 +1,6 @@
 
 
-See raddb/mods-available/dhcp_sqlippool for the IP Pool configuration.
-
-See raddb/policy.d/dhcp_sqlippool for the "glue" code that allows
-the RADIUS based "sqlippool" module to be used for DHCP.
+See raddb/mods-available/sqlippool for the IP Pool configuration.
 
 See raddb/mods-config/sql/ippool/ for the schemas.
 
@@ -297,7 +294,7 @@ recv Discover {
 	dhcp_common
 #	mac2ip
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 #	&reply.Message-Type = Offer
 #	ok
 }
@@ -311,7 +308,7 @@ recv Request {
 	dhcp_common
 #	mac2ip
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 	if (ok) {
 		&reply.Your-IP-Address := "%{&request.Requested-IP-Address || &request.Client-IP-Address}"
 	}
@@ -319,7 +316,7 @@ recv Request {
 }
 recv Decline {
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 	ok
 }
 recv Inform {
@@ -335,7 +332,7 @@ recv Inform {
 #}
 recv Release {
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 	ok
 }
 recv Lease-Query {
diff --git a/raddb/policy.d/dhcp b/raddb/policy.d/dhcp
index 5a5b15222aa..12548fdce0d 100644
--- a/raddb/policy.d/dhcp
+++ b/raddb/policy.d/dhcp
@@ -8,6 +8,6 @@ dhcp_common {
 	&reply.Subnet-Mask = 255.255.255.0
 	&reply.Router-Address = 192.0.2.1
 	&reply.IP-Address-Lease-Time = 7200
-#	&reply.IP-Address-Lease-Time = "${modules.sqlippool[dhcp_sqlippool].lease_duration}"
+#	&reply.IP-Address-Lease-Time = "${modules.sqlippool[sqlippool].lease_duration}"
 	&reply.Server-Identifier = &control.Server-Identifier
 }
diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp
index 27708ce672f..d1c16a0321b 100644
--- a/raddb/sites-available/dhcp
+++ b/raddb/sites-available/dhcp
@@ -3,10 +3,7 @@
 #
 #	This is a virtual server that handles DHCP.
 #
-#  See raddb/mods-available/dhcp_sqlippool for the IP Pool configuration.
-#
-#  See raddb/policy.d/dhcp_sqlippool for the "glue" code that allows
-#  the RADIUS based "sqlippool" module to be used for DHCP.
+#  See raddb/mods-available/sqlippool for the IP Pool configuration.
 #
 #  See raddb/mods-config/sql/ippool/ for the schemas.
 #
@@ -149,7 +146,7 @@ recv Discover {
 	#  Or, allocate IPs from the DHCP pool in SQL. You may need to
 	#  set the pool name here if you haven't set it elsewhere.
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 
 	#  Set the type of packet to send in reply.
 	#
@@ -209,7 +206,7 @@ recv Request {
 	#  Or, allocate IPs from the DHCP pool in SQL. You may need to
 	#  set the pool name here if you haven't set it elsewhere.
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 
 	if (ok) {
 		&reply.Your-IP-Address := "%{&request.Requested-IP-Address || &request.Client-IP-Address}"
@@ -235,7 +232,7 @@ recv Decline {
 	#  If using IPs from a DHCP pool in SQL then you may need to set the
 	#  pool name here if you haven't set it elsewhere and mark the IP as declined.
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 
 	ok
 }
@@ -267,7 +264,7 @@ recv Release {
 	#  If using IPs from a DHCP pool in SQL then you may need to set the
 	#  pool name here if you haven't set it elsewhere and release the IP.
 #	&control.IP-Pool.Name := "local"
-#	dhcp_sqlippool
+#	sqlippool
 
 	ok
 }