From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 22 Jan 2024 13:55:44 +0000 (+0000)
Subject: Align sqlippool behaviour with redis_ippool
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93e88edb43aee85e3f6a916ae7c1f7f66ded669f;p=thirdparty%2Ffreeradius-server.git

Align sqlippool behaviour with redis_ippool

by updating `gateway` on each address update.
---

diff --git a/raddb/mods-config/sql/ippool/mssql/queries.conf b/raddb/mods-config/sql/ippool/mssql/queries.conf
index d8a8dd8aa08..5f1078aeb41 100644
--- a/raddb/mods-config/sql/ippool/mssql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mssql/queries.conf
@@ -209,6 +209,7 @@ update_update = "\
 	UPDATE ${ippool_table} \
 	SET \
 		expiry_time = DATEADD(SECOND,${lease_duration},CURRENT_TIMESTAMP), \
+		gateway = '${gateway}', \
 		counter = counter + 1 \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND owner = '${owner}' \
diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 929d38cd66c..75a76a0abd0 100644
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -171,6 +171,7 @@ update_update = "\
 	UPDATE ${ippool_table} \
 	SET \
 		expiry_time = NOW() + INTERVAL ${lease_duration} SECOND, \
+		gateway = '${gateway}', \
 		counter = counter + 1 \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND owner = '${owner}' \
diff --git a/raddb/mods-config/sql/ippool/oracle/queries.conf b/raddb/mods-config/sql/ippool/oracle/queries.conf
index b93ef5a4965..8e824a7e80b 100644
--- a/raddb/mods-config/sql/ippool/oracle/queries.conf
+++ b/raddb/mods-config/sql/ippool/oracle/queries.conf
@@ -129,6 +129,7 @@ update_update = "\
 	UPDATE ${ippool_table} \
 	SET \
 		expiry_time = current_timestamp + INTERVAL '${lease_duration}' second(1), \
+		gateway = '${gateway}', \
 		counter = counter + 1 \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND owner = '${owner}' \
diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf
index bb33b7b97f8..6935da23af7 100644
--- a/raddb/mods-config/sql/ippool/postgresql/queries.conf
+++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf
@@ -190,6 +190,7 @@ update_update = "\
 	UPDATE ${ippool_table} \
 	SET \
 		expiry_time = 'now'::timestamp(0) + '${lease_duration} second'::interval, \
+		gateway = '${gateway}', \
 		counter = counter + 1 \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND owner = '${owner}' \
diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf
index df7384e449b..a412c02990d 100644
--- a/raddb/mods-config/sql/ippool/sqlite/queries.conf
+++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf
@@ -140,6 +140,7 @@ update_update = "\
 	UPDATE ${ippool_table} \
 	SET \
 		expiry_time = datetime(strftime('%%s', 'now') + ${lease_duration}, 'unixepoch'), \
+		gateway = '${gateway}', \
 		counter = counter + 1 \
 	WHERE pool_name = '%{control.${pool_name}}' \
 	AND owner = '${owner}' \