From: Thomas Faller <t.faller@stiegeler.com>
Date: Tue, 12 May 2020 18:56:45 +0000 (+0200)
Subject: ippool - mysql: simplified allocate_find query.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b73529787fd78d2037448ba412c79aeebfec000;p=thirdparty%2Ffreeradius-server.git

ippool - mysql: simplified allocate_find query.
---

diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 5b01cd5c3a1..f48ff996358 100644
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -90,7 +90,7 @@ allocate_find = "\
 	SELECT framedipaddress FROM ${ippool_table} \
 	WHERE pool_name = '%{control:Pool-Name}' \
 	AND ( \
-		expiry_time < NOW() OR expiry_time IS NULL OR expiry_time = 0 \
+		expiry_time < NOW() OR expiry_time IS NULL \
 		OR ( nasipaddress = '%{NAS-IP-Address}' AND pool_key = '${pool_key}' ) \
 	) \
 	ORDER BY \