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 b753c57474ff9f53498c1cd22f7dd641e697f20f..5518edda53b009814aeb1408bdc76394e12a694f 100644 (file)
--- 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 39a53c5948cebd12a3c87bd630bbf4edb46848cf..31f93a018f1224ec297d7df8e197bffd7c076036 100644 (file)
--- 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 d0c367ee9035f2d431d8163188607868d8a4fe5a..e3dd7670f95c6cceab57004d0d945f541c941b89 100644 (file)
--- 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 68bf1130c971092726aeb974726cda18225b8116..2f0f463e6fdc5b72b33fbbd5211da509e85ed08e 100644 (file)
--- 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 7584cb8582282e5b3a4863b7c1eb93586c7b7f6d..4a968d36327ceb3d98ee15904f14edd97f2d34cc 100644 (file)
--- 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 61ca2b683d22f92be870af239571badb94ee97dd..7c52637d11dd04f6b229fd26bcbc923436fd2f74 100644 (file)
--- 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 c9190f826338e714c5633c5cdcc2faacc2829e22..347e3e59f35e88cb194d582be4aebb542002f063 100644 (file)
--- 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