|
 |
cf6b55 |
From 3fd832baf898fe6d6f974cd2d36d1c5206bc2209 Mon Sep 17 00:00:00 2001
|
|
|
cf6b55 |
From: Antonio Torres <antorres@redhat.com>
|
|
|
cf6b55 |
Date: Fri, 12 Nov 2021 16:23:05 +0100
|
|
|
cf6b55 |
Subject: [PATCH] Fix unterminated strings in SQL queries
|
|
|
cf6b55 |
|
|
|
cf6b55 |
Resolves: bz#2021247
|
|
|
cf6b55 |
Signed-off-by: Antonio Torres <antorres@redhat.com>
|
|
|
cf6b55 |
---
|
|
|
cf6b55 |
raddb/mods-config/sql/ippool/mysql/queries.conf | 2 +-
|
|
|
cf6b55 |
raddb/mods-config/sql/ippool/sqlite/queries.conf | 2 +-
|
|
|
cf6b55 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
cf6b55 |
|
|
|
cf6b55 |
diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
|
|
|
cf6b55 |
index 2dfc6574dd..444812a047 100644
|
|
|
cf6b55 |
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
|
|
|
cf6b55 |
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
|
|
|
cf6b55 |
@@ -114,7 +114,7 @@ allocate_update = "\
|
|
|
cf6b55 |
nasipaddress = '%{NAS-IP-Address}', pool_key = '${pool_key}', \
|
|
|
cf6b55 |
callingstationid = '%{Calling-Station-Id}', \
|
|
|
cf6b55 |
username = '%{User-Name}', expiry_time = NOW() + INTERVAL ${lease_duration} SECOND \
|
|
|
cf6b55 |
- WHERE framedipaddress = '%I'
|
|
|
cf6b55 |
+ WHERE framedipaddress = '%I'"
|
|
|
cf6b55 |
|
|
|
cf6b55 |
#
|
|
|
cf6b55 |
# Use a stored procedure to find AND allocate the address. Read and customise
|
|
|
cf6b55 |
diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf
|
|
|
cf6b55 |
index 31a5df3659..e92466108b 100644
|
|
|
cf6b55 |
--- a/raddb/mods-config/sql/ippool/sqlite/queries.conf
|
|
|
cf6b55 |
+++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf
|
|
|
cf6b55 |
@@ -89,7 +89,7 @@ allocate_update = "\
|
|
|
cf6b55 |
callingstationid = '%{Calling-Station-Id}', \
|
|
|
cf6b55 |
username = '%{User-Name}', \
|
|
|
cf6b55 |
expiry_time = datetime(strftime('%%s', 'now') + ${lease_duration}, 'unixepoch') \
|
|
|
cf6b55 |
- WHERE framedipaddress = '%I'
|
|
|
cf6b55 |
+ WHERE framedipaddress = '%I'"
|
|
|
cf6b55 |
|
|
|
cf6b55 |
#
|
|
|
cf6b55 |
# This series of queries frees an IP number when an accounting START record arrives
|
|
|
cf6b55 |
--
|
|
|
cf6b55 |
2.31.1
|
|
|
cf6b55 |
|