From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 10 Feb 2023 15:45:47 +0000 (-0500)
Subject: Revert "run the accounting "post-auth" query for sql_session_start"
X-Git-Tag: release_3_0_27~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c76424ce29fc24e482304a5eff0d025d1a142c9;p=thirdparty%2Ffreeradius-server.git

Revert "run the accounting "post-auth" query for sql_session_start"

This reverts commit 1e8f652994c02278ba0be19ec8aa686a43a40f2b.
---

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index b753c57474..5518edda53 100644
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -175,7 +175,7 @@ simul_verify_query = "\
 # combination of attributes, or custom 'Acct-Status-Type' values.
 #######################################################################
 accounting {
-	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}"
+	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}"
 
 	# Write SQL queries to a logfile. This is potentially useful for bulk inserts
 	# when used with the rlm_sql_null driver.
diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 39a53c5948..31f93a018f 100644
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -1,4 +1,4 @@
- -*- text -*-
+# -*- text -*-
 #
 #  main/mysql/queries.conf-- MySQL configuration for default schema (schema.sql)
 #
@@ -256,7 +256,7 @@ simul_verify_query = "\
 # combination of attributes, or custom 'Acct-Status-Type' values.
 #######################################################################
 accounting {
-	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}"
+	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}"
 
 	# Write SQL queries to a logfile. This is potentially useful for bulk inserts
 	# when used with the rlm_sql_null driver.
diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index d0c367ee90..e3dd7670f9 100644
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -225,7 +225,7 @@ group_membership_query = "\
 # combination of attributes, or custom 'Acct-Status-Type' values.
 #######################################################################
 accounting {
-	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}"
+	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}"
 
 	# Write SQL queries to a logfile. This is potentially useful for bulk inserts
 	# when used with the rlm_sql_null driver.
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 68bf1130c9..2f0f463e6f 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -278,7 +278,7 @@ group_membership_query = "\
 #######################################################################
 
 accounting {
-	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}"
+	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}"
 
 	# Write SQL queries to a logfile. This is potentially useful for bulk inserts
 	# when used with the rlm_sql_null driver.
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index 7584cb8582..4a968d3632 100644
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -238,7 +238,7 @@ simul_verify_query = "\
 # combination of attributes, or custom 'Acct-Status-Type' values.
 #######################################################################
 accounting {
-	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}"
+	reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}"
 
 	# Write SQL queries to a logfile. This is potentially useful for bulk inserts
 	# when used with the rlm_sql_null driver.
diff --git a/raddb/policy.d/accounting b/raddb/policy.d/accounting
index 61ca2b683d..7c52637d11 100644
--- a/raddb/policy.d/accounting
+++ b/raddb/policy.d/accounting
@@ -122,12 +122,13 @@ acct_counters64.preacct {
 #  the session information.
 #
 sql_session_start.post-auth {
+	acct_unique
+
 	#
 	#  The SQL accounting queries need an Acct-Status-Type attribute
 	#
 	update request {
-		&Acct-Session-Query := "post-auth"
-		&Acct-Status-Type := Start
+		Acct-Status-Type := Start
 	}
 	sql.accounting
 }
diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index c9190f8263..347e3e59f3 100644
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -252,11 +252,6 @@ ATTRIBUTE	FreeRADIUS-Client-Src-IP-Address	1153	ipaddr
 ATTRIBUTE	FreeRADIUS-Client-Src-IPv6-Address	1154	ipv6addr
 ATTRIBUTE	FreeRADIUS-Response-Delay-USec		1155	integer
 
-#
-# For sql_session_start policy
-#
-ATTRIBUTE	Acct-Session-Query			1156	string
-
 ATTRIBUTE	REST-HTTP-Header			1160	string
 ATTRIBUTE	REST-HTTP-Body				1161	string
 ATTRIBUTE	REST-HTTP-Status-Code			1162	integer