From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 24 Jun 2024 18:23:34 +0000 (+0100)
Subject: sqlippool query fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4582ed78b8a1258a5e070d478f053271016847aa;p=thirdparty%2Ffreeradius-server.git

sqlippool query fixes
---

diff --git a/raddb/mods-config/sql/ippool/mssql/queries.conf b/raddb/mods-config/sql/ippool/mssql/queries.conf
index 97af29f5758..cefcb5c9b06 100644
--- a/raddb/mods-config/sql/ippool/mssql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mssql/queries.conf
@@ -163,6 +163,8 @@ pool_check = "\
 #  Use a stored procedure to find AND allocate the address. Read and customise
 #  `procedure.sql` in this directory to determine the optimal configuration.
 #
+#  Comment out alloc_existing, alloc_requested and alloc_update to use this
+#
 #alloc_begin = ""
 #alloc_find = "\
 #	EXEC fr_ippool_allocate_previous_or_new_address \
@@ -170,9 +172,8 @@ pool_check = "\
 #		@v_gateway = '${gateway}', \
 #		@v_owner = '${owner}', \
 #		@v_lease_duration = ${offer_duration}, \
-#		@v_requested_address = '%{${requested_address} || 0.0.0.0}'
+#		@v_requested_address = '%{${requested_address} || 0.0.0.0}' \
 #	"
-#alloc_update = ""
 #alloc_commit = ""
 
 
diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 47445df28c8..da05f3b1564 100644
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -126,6 +126,8 @@ alloc_update = "\
 #  Use a stored procedure to find AND allocate the address. Read and customise
 #  `procedure.sql` in this directory to determine the optimal configuration.
 #
+#  Comment out alloc_existing, alloc_requested and alloc_update to use this
+#
 #alloc_begin = ""
 #alloc_find = "\
 #	CALL fr_ippool_allocate_previous_or_new_address( \
@@ -133,9 +135,8 @@ alloc_update = "\
 #		'${gateway}', \
 #		'${owner}', \
 #		${offer_duration}, \
-#		'%{${requested_address} || 0.0.0.0}'
+#		'%{${requested_address} || 0.0.0.0}' \
 #	)"
-#alloc_update = ""
 #alloc_commit = ""
 
 
diff --git a/raddb/mods-config/sql/ippool/oracle/queries.conf b/raddb/mods-config/sql/ippool/oracle/queries.conf
index a127b8fe2dd..31272bf9ca7 100644
--- a/raddb/mods-config/sql/ippool/oracle/queries.conf
+++ b/raddb/mods-config/sql/ippool/oracle/queries.conf
@@ -27,9 +27,8 @@ alloc_find = "\
 		'${gateway}', \
 		'${owner}', \
 		'${offer_duration}', \
-		'%{${requested_address} || 0.0.0.0}'
+		'%{${requested_address} || 0.0.0.0}' \
 	) FROM dual"
-alloc_update = ""
 alloc_commit = ""
 
 
diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf
index 48f584eeb6a..28dc2d93a83 100644
--- a/raddb/mods-config/sql/ippool/postgresql/queries.conf
+++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf
@@ -155,7 +155,6 @@ pool_check = "\
 #		'${offer_duration}', \
 #		'%{${requested_address} || 0.0.0.0}' \
 #	)"
-#alloc_update = ""
 #alloc_commit = ""