From 18e2c11cb7c7a0baced59988526f3370049791d4 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Sun, 11 Aug 2024 21:32:24 -0400 Subject: [PATCH] remove AcctStartDelay. it hasn't ever been used, either. --- raddb/mods-config/sql/main/mssql/queries.conf | 8 -------- raddb/mods-config/sql/main/mssql/schema.sql | 4 +--- raddb/mods-config/sql/main/oracle/queries.conf | 8 -------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf index ce8cf1e73b..0fe731ec1b 100644 --- a/raddb/mods-config/sql/main/mssql/queries.conf +++ b/raddb/mods-config/sql/main/mssql/queries.conf @@ -175,7 +175,6 @@ accounting { FramedIPv6Prefix, \ FramedInterfaceId, \ DelegatedIPv6Prefix, \ - AcctStartDelay, \ Class) \ VALUES(\ '%{Acct-Session-Id}', \ @@ -202,15 +201,12 @@ accounting { '%{Framed-IPv6-Prefix}', \ '%{Framed-Interface-Id}', \ '%{Delegated-IPv6-Prefix}', \ - '%{Acct-Delay-Time}', \ - '0', \ '%{Class}')" query = "\ UPDATE ${...acct_table1} \ SET \ AcctStartTime = ${...event_timestamp}, \ - AcctStartDelay = '%{&Acct-Delay-Time || 0}', \ ConnectInfo_start = '%{Connect-Info}' \ WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \ AND AcctStopTime = 0" @@ -259,7 +255,6 @@ accounting { FramedIPv6Prefix, \ FramedInterfaceId, \ DelegatedIPv6Prefix, \ - AcctStartDelay, \ Class) \ VALUES(\ '%{Acct-Session-Id}', \ @@ -285,7 +280,6 @@ accounting { '%{Framed-IPv6-Prefix}', \ '%{Framed-Interface-Id}', \ '%{Delegated-IPv6-Prefix}', \ - '0' \ '%{Class}')" } @@ -329,7 +323,6 @@ accounting { FramedIPv6Prefix, \ FramedInterfaceId, \ DelegatedIPv6Prefix, \ - AcctStartDelay, \ Class) \ VALUES(\ '%{Acct-Session-Id}', \ @@ -357,7 +350,6 @@ accounting { '%{Framed-IPv6-Prefix}', \ '%{Framed-Interface-Id}', \ '%{Delegated-IPv6-Prefix}', \ - '0', \ '%{Class}')" } } diff --git a/raddb/mods-config/sql/main/mssql/schema.sql b/raddb/mods-config/sql/main/mssql/schema.sql index e72a017148..0a51a74418 100644 --- a/raddb/mods-config/sql/main/mssql/schema.sql +++ b/raddb/mods-config/sql/main/mssql/schema.sql @@ -1,6 +1,6 @@ -- $Id$d$ -- --- schela.sql rlm_sql - FreeRADIUS SQL Module +-- schema.sql rlm_sql - FreeRADIUS SQL Module -- -- Database schema for MSSQL rlm_sql module -- @@ -47,7 +47,6 @@ CREATE TABLE [radacct] ( [FramedIPv6Prefix] [varchar] (45) NOT NULL, [FramedInterfaceId] [varchar] (44) NOT NULL, [DelegatedIPv6Prefix] [varchar] (45) NOT NULL, - [AcctStartDelay] [int] NULL, [Class] [varchar] (64) NULL ) ON [PRIMARY] GO @@ -80,7 +79,6 @@ ALTER TABLE [radacct] WITH NOCHECK ADD CONSTRAINT [DF_radacct_FramedIPv6Prefix] DEFAULT ('') FOR [FramedIPv6Prefix], CONSTRAINT [DF_radacct_FramedInterfaceId] DEFAULT ('') FOR [FramedInterfaceId], CONSTRAINT [DF_radacct_DelegatedIPv6Prefix] DEFAULT ('') FOR [DelegatedIPv6Prefix], - CONSTRAINT [DF_radacct_AcctStartDelay] DEFAULT (null) FOR [AcctStartDelay], CONSTRAINT [DF_radacct_Class] DEFAULT (null) FOR [Class], CONSTRAINT [PK_radacct] PRIMARY KEY NONCLUSTERED ( diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf index b5b2f92e90..81a2f11b58 100644 --- a/raddb/mods-config/sql/main/oracle/queries.conf +++ b/raddb/mods-config/sql/main/oracle/queries.conf @@ -181,7 +181,6 @@ accounting { FramedIPv6Prefix, \ FramedInterfaceId, \ DelegatedIPv6Prefix, \ - AcctStartDelay, \ Class) \ VALUES(\ '', \ @@ -210,14 +209,12 @@ accounting { '%{Framed-IPv6-Prefix}', \ '%{Framed-Interface-Id}', \ '%{Delegated-IPv6-Prefix}', \ - '%{Acct-Delay-Time}', \ '%{Class}')" query = "\ UPDATE ${...acct_table1} \ SET \ AcctStartTime = ${...event_timestamp}, \ - AcctStartDelay = '%{&Acct-Delay-Time || 0}', \ ConnectInfo_start = '%{Connect-Info}' \ WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \ AND AcctStopTime IS NULL" @@ -260,7 +257,6 @@ accounting { ServiceType, \ FramedProtocol, \ FramedIPAddress, \ - AcctStartDelay, \ Class) \ VALUES(\ '', \ @@ -282,7 +278,6 @@ accounting { '%{Service-Type}', \ '%{Framed-Protocol}', \ '%{Framed-IP-Address}', \ - '0', \ '%{Class}')" } @@ -324,7 +319,6 @@ accounting { ServiceType, \ FramedProtocol, \ FramedIPAddress, \ - AcctStartDelay, \ Class) \ VALUES(\ '', \ @@ -350,8 +344,6 @@ accounting { '%{Service-Type}', \ '%{Framed-Protocol}', \ '%{Framed-IP-Address}', \ - '0', \ - '%{&Acct-Delay-Time || 0}', \ '%{Class}')" } } -- 2.47.3