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 0608cd1c62c830a985a27675f9ffc718bc64c3c9..90026a95b0721f2d16a06faf9d1a49f74182984e 100644 (file)
--- 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'"
 
 
 #