]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
projects / thirdparty / freeradius-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c2a54b)
don't use bare words in || expansions
authorAlan T. DeKok <aland@freeradius.org>
Fri, 6 Oct 2023 12:28:30 +0000 (08:28 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 6 Oct 2023 12:28:30 +0000 (08:28 -0400)
raddb/mods-config/sql/main/mssql/queries.conf patch | blob | blame | history
raddb/mods-config/sql/main/mysql/queries.conf patch | blob | blame | history
raddb/mods-config/sql/main/oracle/queries.conf patch | blob | blame | history
raddb/mods-config/sql/main/postgresql/queries.conf patch | blob | blame | history
raddb/mods-config/sql/main/sqlite/queries.conf patch | blob | blame | history

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index fd32c59e942846b6f1cbfa4419161752de1cc3ac..83c9b07b615342109215f14392e984924c6e2d01 100644 (file)
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -155,7 +155,7 @@ accounting {
                                        AcctStopTime=${....event_timestamp}, \
                                        AcctSessionTime=${....event_timestamp_epoch} - \
                                                DATEDIFF(SS, '1970-01-01', AcctStartTime), \
-                                       AcctTerminateCause='%{&Acct-Terminate-Cause || NAS-Reboot}', \
+                                       AcctTerminateCause='%{&Acct-Terminate-Cause || \'NAS-Reboot\'}', \
                                        AcctStopDelay = %{&Acct-Delay-Time || 0} \
                                WHERE AcctStopTime = 0 \
                                AND NASIPAddress = '%{NAS-IP-Address}' \
diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 72ae7d63ff087f29824e3d776f6f29b00ae6c743..a95d643281a44aa39c63ef8be5543705cdaacf23 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -205,7 +205,7 @@ accounting {
                                        acctstoptime = ${....event_timestamp}, \
                                        acctsessiontime = '${....event_timestamp_epoch}' \
                                                - UNIX_TIMESTAMP(acctstarttime), \
-                                       acctterminatecause = '%{&Acct-Terminate-Cause || NAS-Reboot}' \
+                                       acctterminatecause = '%{&Acct-Terminate-Cause || \'NAS-Reboot\'}' \
                                WHERE acctstoptime IS NULL \
                                AND nasipaddress   = '%{NAS-IP-Address}' \
                                AND acctstarttime <= ${....event_timestamp}"
@@ -315,7 +315,7 @@ accounting {
                                        framedipv6prefix = '%{Framed-IPv6-Prefix}', \
                                        framedinterfaceid = '%{Framed-Interface-Id}', \
                                        delegatedipv6prefix = '%{Delegated-IPv6-Prefix}', \
-                                       acctsessiontime = %{&Acct-Session-Time || NULL}, \
+                                       acctsessiontime = %{&Acct-Session-Time || \'NULL\'}, \
                                        acctinputoctets = %{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
                                        acctoutputoctets = %{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
                                        class = '%{Class}' \
@@ -339,7 +339,7 @@ accounting {
                                        FROM_UNIXTIME(${....event_timestamp_epoch} - %{&Acct-Session-Time || 0}), \
                                        ${....event_timestamp}, \
                                        NULL, \
-                                       %{&Acct-Session-Time || NULL}, \
+                                       %{&Acct-Session-Time || \'NULL\'}, \
                                        '%{Acct-Authentic}', \
                                        '%{Connect-Info}', \
                                        '', \
@@ -365,7 +365,7 @@ accounting {
                        query = "\
                                UPDATE ${....acct_table2} SET \
                                        acctstoptime    = ${....event_timestamp}, \
-                                       acctsessiontime = %{&Acct-Session-Time || NULL}, \
+                                       acctsessiontime = %{&Acct-Session-Time || \'NULL\'}, \
                                        acctinputoctets = '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}', \
                                        acctoutputoctets = '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}', \
                                        acctterminatecause = '%{Acct-Terminate-Cause}', \
@@ -391,7 +391,7 @@ accounting {
                                        FROM_UNIXTIME(${....event_timestamp_epoch} - %{&Acct-Session-Time || 0}), \
                                        ${....event_timestamp}, \
                                        ${....event_timestamp}, \
-                                       %{&Acct-Session-Time || NULL}, \
+                                       %{&Acct-Session-Time || \'NULL\'}, \
                                        '%{Acct-Authentic}', \
                                        '', \
                                        '%{Connect-Info}', \
diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index e62eda3ad2359c29f0c48870e7964b02ae0d88b1..599a1b8d77812ccc8fb76ff8cd0e4a2036186299 100644 (file)
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -162,7 +162,7 @@ accounting {
                                        AcctStopTime = ${....event_timestamp}, \
                                        AcctSessionTime = ROUND((${....event_timestamp} - \
                                                TO_DATE(TO_CHAR(acctstarttime, 'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss'))*86400), \
-                                       AcctTerminateCause='%{&Acct-Terminate-Cause || NAS-Reboot}', \
+                                       AcctTerminateCause='%{&Acct-Terminate-Cause || \'NAS-Reboot\'}', \
                                        AcctStopDelay = %{&Acct-Delay-Time || 0}, \
                                        Class = '%{Class}' \
                                WHERE AcctStopTime IS NULL \
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index c8cfad6b30b3a4c3462e8dd3262f9b8963eb1a71..c8c37d9c083e80449d205b02694791ab872ebcfa 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -247,7 +247,7 @@ accounting {
                                        AcctStopTime = ${....event_timestamp}, \
                                        AcctUpdateTime = ${....event_timestamp}, \
                                        AcctSessionTime = (${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime))), \
-                                       AcctTerminateCause = '%{&Acct-Terminate-Cause || NAS-Reboot}', \
+                                       AcctTerminateCause = '%{&Acct-Terminate-Cause || \'NAS-Reboot\'}', \
                                        Class = '%{Class}' \
                                WHERE AcctStopTime IS NULL \
                                AND NASIPAddress= '%{&NAS-IPv6-Address || &NAS-IP-Address}' \
@@ -353,7 +353,7 @@ accounting {
                                        FramedIPv6Prefix = NULLIF('%{Framed-IPv6-Prefix}', '')::inet, \
                                        FramedInterfaceId = NULLIF('%{Framed-Interface-Id}', ''), \
                                        DelegatedIPv6Prefix = NULLIF('%{Delegated-IPv6-Prefix}', '')::inet, \
-                                       AcctSessionTime = %{&Acct-Session-Time || NULL}, \
+                                       AcctSessionTime = %{&Acct-Session-Time || \'NULL\'}, \
                                        AcctInterval = (${....event_timestamp_epoch} - EXTRACT(EPOCH FROM (COALESCE(AcctUpdateTime, AcctStartTime)))), \
                                        AcctUpdateTime = ${....event_timestamp}, \
                                        AcctInputOctets = %{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
@@ -376,7 +376,7 @@ accounting {
                                        ${....event_timestamp}, \
                                        ${....event_timestamp}, \
                                        NULL, \
-                                       %{&Acct-Session-Time || NULL}, \
+                                       %{&Acct-Session-Time || \'NULL\'}, \
                                        '%{Acct-Authentic}', \
                                        '%{Connect-Info}', \
                                        NULL, \
@@ -403,7 +403,7 @@ accounting {
                                SET \
                                        AcctStopTime = ${....event_timestamp}, \
                                        AcctUpdateTime = ${....event_timestamp}, \
-                                       AcctSessionTime = COALESCE(%{&Acct-Session-Time || NULL}, \
+                                       AcctSessionTime = COALESCE(%{&Acct-Session-Time || \'NULL\'}, \
                                                (${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime)))), \
                                        AcctInputOctets = %{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
                                        AcctOutputOctets = %{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
@@ -458,7 +458,7 @@ accounting {
                                SET \
                                        AcctStopTime = ${....event_timestamp}, \
                                        AcctUpdateTime = ${....event_timestamp}, \
-                                       AcctSessionTime = COALESCE(%{&Acct-Session-Time || NULL}, \
+                                       AcctSessionTime = COALESCE(%{&Acct-Session-Time || \'NULL\'}, \
                                                (${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime)))), \
                                        AcctInputOctets = (%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets})::bigint, \
                                        AcctOutputOctets = (%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets})::bigint, \
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index 1afd1d3200a8795824a5579f87b85676a8ceffe6..f0ae881ec9f9e675ba2ecb6be2bd906c01aa0447 100644 (file)
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -325,7 +325,7 @@ accounting {
                                        framedipv6prefix = '%{Framed-IPv6-Prefix}', \
                                        framedinterfaceid = '%{Framed-Interface-Id}', \
                                        delegatedipv6prefix = '%{Delegated-IPv6-Prefix}', \
-                                       acctsessiontime = %{&Acct-Session-Time || NULL}, \
+                                       acctsessiontime = %{&Acct-Session-Time || \'NULL\'}, \
 
                                        class = '%{Class}' \
                                WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
@@ -348,7 +348,7 @@ accounting {
                                        (${....event_timestamp_epoch} - %{&Acct-Session-Time || 0}), \
                                        ${....event_timestamp}, \
                                        NULL, \
-                                       %{&Acct-Session-Time || NULL}, \
+                                       %{&Acct-Session-Time || \'NULL\'}, \
                                        '%{Acct-Authentic}', \
                                        '%{Connect-Info}', \
                                        '', \
@@ -374,7 +374,7 @@ accounting {
                        query = "\
                                UPDATE ${....acct_table2} SET \
                                        acctstoptime    = ${....event_timestamp}, \
-                                       acctsessiontime = %{&Acct-Session-Time || NULL}, \
+                                       acctsessiontime = %{&Acct-Session-Time || \'NULL\'}, \
                                        acctinputoctets = %{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
                                        acctoutputoctets = %{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
                                        acctterminatecause = '%{Acct-Terminate-Cause}', \
@@ -400,7 +400,7 @@ accounting {
                                        (${....event_timestamp_epoch} - %{&Acct-Session-Time || 0}), \
                                        ${....event_timestamp}, \
                                        ${....event_timestamp}, \
-                                       %{&Acct-Session-Time || NULL}, \
+                                       %{&Acct-Session-Time || \'NULL\'}, \
                                        '%{Acct-Authentic}', \
                                        '', \
                                        '%{Connect-Info}', \
Mirror of https://github.com/FreeRADIUS/freeradius-server.git