Re-order query. Makes no real difference, but makes it easier to understand, and...

diff --git a/raddb/sql/postgresql/ippool.conf b/raddb/sql/postgresql/ippool.conf
index 6df1e37..3468bbf 100644 (file)
--- a/raddb/sql/postgresql/ippool.conf
+++ b/raddb/sql/postgresql/ippool.conf
@@ -79,9 +79,9 @@
   SET expiry_time = 'now'::timestamp(0) + '${lease-duration} seconds'::interval \
   WHERE nasipaddress = '%{Nas-IP-Address}' \
   AND pool_key = '${pool-key}' \
+  AND framedipaddress = '%{Framed-IP-Address}' \
   AND username = '%{SQL-User-Name}' \
-  AND callingstationid = '%{Calling-Station-Id}' \
-  AND framedipaddress = '%{Framed-IP-Address}'"
+  AND callingstationid = '%{Calling-Station-Id}'" 
 
 
  ## This query frees all IP addresses allocated to a NAS when an