From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 13 Apr 2021 08:59:09 +0000 (+0100)
Subject: Correct alloc_update and alloc_requested queries for sqlite
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6fc178f85ebd40a23746ef6d20acca476c7646;p=thirdparty%2Ffreeradius-server.git

Correct alloc_update and alloc_requested queries for sqlite
---

diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf
index 0608cd1c62c..90026a95b07 100644
--- a/raddb/mods-config/sql/ippool/sqlite/queries.conf
+++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf
@@ -53,7 +53,8 @@ alloc_requested = "SELECT address \
 	ON ${ippool_table}.status_id = fr_ippool_status.status_id \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND address = '%{${requested_address}:-0.0.0.0}' \
-	AND status = 'dynamic'"
+	AND status = 'dynamic' \
+	AND expiry_time < datetime('now')"
 
 #
 #  Finally find a free address
@@ -103,8 +104,7 @@ alloc_update = "\
 		gateway = '${gateway}', \
 		owner = '${owner}', \
 		expiry_time = datetime(strftime('%%s', 'now') + ${offer_duration}, 'unixepoch') \
-	WHERE address = '%I' \
-	AND expiry_time IS NULL"
+	WHERE address = '%I'"
 
 
 #