From: Nathan Ward <nward@braintrust.co.nz>
Date: Fri, 11 Jan 2019 03:14:13 +0000 (+1300)
Subject: Comment out sqlippool PostgreSQL allocate_find query, so only one allocate_find query... 
X-Git-Tag: release_3_0_18~93^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75e187c1bbf70353cf52ef6f7bc8a6805a90759;p=thirdparty%2Ffreeradius-server.git

Comment out sqlippool PostgreSQL allocate_find query, so only one allocate_find query is uncommented, mirroring MySQL and Oracle queries configs.
---

diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf
index f7942072cb2..8aa9fb79e7a 100644
--- a/raddb/mods-config/sql/ippool/postgresql/queries.conf
+++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf
@@ -39,12 +39,12 @@ allocate_find = "\
 #
 #  If you prefer to allocate a random IP address every time, use this query instead
 #
-allocate_find = "\
-	SELECT framedipaddress FROM ${ippool_table} \
-	WHERE pool_name = '%{control:${pool_name}}' AND expiry_time < 'now'::timestamp(0) \
-	ORDER BY RANDOM() \
-	LIMIT 1 \
-	FOR UPDATE"
+#allocate_find = "\
+#	SELECT framedipaddress FROM ${ippool_table} \
+#	WHERE pool_name = '%{control:${pool_name}}' AND expiry_time < 'now'::timestamp(0) \
+#	ORDER BY RANDOM() \
+#	LIMIT 1 \
+#	FOR UPDATE"
 
 #
 #  The above query again, but with SKIP LOCKED. This requires PostgreSQL >= 9.5.