From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 8 Sep 2021 14:08:29 +0000 (-0400)
Subject: pool_name is needed by the queries.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6ed330a8f0749f2803bb1f3caf493ba2589f8ea;p=thirdparty%2Ffreeradius-server.git

pool_name is needed by the queries.

and use ${pool_name} consistently everywhere.

Apparently we don't even use this module during the tests :(
---

diff --git a/raddb/mods-available/sqlippool b/raddb/mods-available/sqlippool
index 74d6899864c..2bf4781acb3 100644
--- a/raddb/mods-available/sqlippool
+++ b/raddb/mods-available/sqlippool
@@ -39,6 +39,11 @@ sqlippool {
 	#
 	lease_duration = 3600
 
+	#
+	#  pool_name: The attribute in the `control` list which contains the pool name.
+	#
+	pool_name = IP-Pool.Name
+
 	#
 	#  allocated_address_attr:: List and attribute where the allocated address is written to.
 	#
diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 189cff33b2e..15fec59aa4e 100644
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -108,7 +108,7 @@ alloc_find = "\
 pool_check = "\
 	SELECT id \
 	FROM ${ippool_table} \
-	WHERE pool_name='%{control.${IP-Pool.Name}}' \
+	WHERE pool_name='%{control.${pool_name}}' \
 	LIMIT 1"
 
 #
diff --git a/raddb/mods-config/sql/ippool/oracle/queries.conf b/raddb/mods-config/sql/ippool/oracle/queries.conf
index 996d366a391..7c5cc4d7aac 100644
--- a/raddb/mods-config/sql/ippool/oracle/queries.conf
+++ b/raddb/mods-config/sql/ippool/oracle/queries.conf
@@ -95,7 +95,7 @@ pool_check = "\
 	FROM (\
 		SELECT id \
 		FROM ${ippool_table} \
-		WHERE pool_name = '%{control.IP-Pool.Name}'\
+		WHERE pool_name = '%{control.${pool_name}}'\
 	) WHERE ROWNUM = 1"
 
 #
diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf
index 0fbe61e0624..0608cd1c62c 100644
--- a/raddb/mods-config/sql/ippool/sqlite/queries.conf
+++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf
@@ -91,7 +91,7 @@ alloc_find = "\
 pool_check = "\
 	SELECT id \
 	FROM ${ippool_table} \
-	WHERE pool_name='%{control.IP-Pool.Name}' \
+	WHERE pool_name='%{control.${pool_name}}' \
 	LIMIT 1"
 
 #