]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Align sqlippool behaviour with redis_ippool
authorNick Porter <nick@portercomputing.co.uk>
Mon, 22 Jan 2024 13:55:44 +0000 (13:55 +0000)
committerNick Porter <nick@portercomputing.co.uk>
Fri, 26 Jan 2024 13:55:37 +0000 (13:55 +0000)
by updating `gateway` on each address update.

raddb/mods-config/sql/ippool/mssql/queries.conf
raddb/mods-config/sql/ippool/mysql/queries.conf
raddb/mods-config/sql/ippool/oracle/queries.conf
raddb/mods-config/sql/ippool/postgresql/queries.conf
raddb/mods-config/sql/ippool/sqlite/queries.conf

index d8a8dd8aa08a074421d76ed66c1f0f6affff1874..5f1078aeb411121cf21e42085b3088319b38d2f0 100644 (file)
@@ -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}' \
index 929d38cd66c9422678d92032aab5a7a6b19e107b..75a76a0abd0bb0d23db7136dbf14582d1b33c73d 100644 (file)
@@ -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}' \
index b93ef5a4965eb790fa6902f4f0dbe17870c67034..8e824a7e80b8e1de64175d05e0701fd030bfd685 100644 (file)
@@ -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}' \
index bb33b7b97f86ab60d41326715c418267fe2bfc7a..6935da23af76a99fee4916259b12845613d37552 100644 (file)
@@ -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}' \
index df7384e449ba4acaa8ecb48bc7ec507ce0f723fb..a412c02990d1e70e88a8f48b78b1ca05ee733cd8 100644 (file)
@@ -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}' \