From: Alan T. DeKok Date: Fri, 6 Oct 2023 12:28:30 +0000 (-0400) Subject: don't use bare words in || expansions X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=385b6b169bdab1b634294a47216f4b854a01212b;p=thirdparty%2Ffreeradius-server.git don't use bare words in || expansions --- diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf index fd32c59e94..83c9b07b61 100644 --- 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 72ae7d63ff..a95d643281 100644 --- 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 e62eda3ad2..599a1b8d77 100644 --- 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 c8cfad6b30..c8c37d9c08 100644 --- 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 1afd1d3200..f0ae881ec9 100644 --- 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}', \