Use AcctUniqueId everywhere

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index cf0800c..50ec35f 100644 (file)
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -163,9 +163,7 @@ accounting {
                                        AcctStartTime = '%S', \
                                        AcctStartDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_start = '%{Connect-Info}' \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress = '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime = 0"
                }
 
@@ -174,9 +172,7 @@ accounting {
                                UPDATE ${....acct_table1} \
                                SET \
                                        FramedIPAddress = '%{Framed-IP-Address}' \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress= '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime = 0"
 
                        query = "\
@@ -221,9 +217,7 @@ accounting {
                                        AcctTerminateCause = '%{Acct-Terminate-Cause}', \
                                        AcctStopDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_stop = '%{Connect-Info}' \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress = '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime = 0"
 
                        query = "\

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 1906c1a..8268abd 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -196,11 +196,6 @@ simul_verify_query = "\
 accounting {
        reference = "%{tolower:type.%{Acct-Status-Type}.query}"
 
-       #
-       #  The session identifier used by all subsequent queries.
-       #
-       session_identifier="(acctuniqueid = '%{Acct-Unique-Session-Id}')"
-
        # Write SQL queries to a logfile. This is potentially useful for bulk inserts
        # when used with the rlm_sql_null driver.
 #      logfile = ${logdir}/accounting.sql
@@ -278,9 +273,7 @@ accounting {
                                        acctstarttime   = FROM_UNIXTIME(%{integer:Event-Timestamp}), \
                                        acctupdatetime  = FROM_UNIXTIME(%{integer:Event-Timestamp}), \
                                        connectinfo_start = '%{Connect-Info}' \
-                               WHERE ${...session_identifier} \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
                }
 
                interim-update {
@@ -303,9 +296,7 @@ accounting {
                                                << 32 | '%{%{Acct-Input-Octets}:-0}', \
                                        acctoutputoctets = '%{%{Acct-Output-Gigawords}:-0}' \
                                                << 32 | '%{%{Acct-Output-Octets}:-0}' \
-                               WHERE ${...session_identifier} \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
 
                        #
                        #  The update condition matched no existing sessions. Use
@@ -354,9 +345,7 @@ accounting {
                                                << 32 | '%{%{Acct-Output-Octets}:-0}', \
                                        acctterminatecause = '%{Acct-Terminate-Cause}', \
                                        connectinfo_stop = '%{Connect-Info}' \
-                               WHERE ${...session_identifier} \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
 
                        #
                        #  The update condition matched no existing sessions. Use

diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index 479d7a8..574dc45 100644 (file)
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -245,9 +245,7 @@ accounting {
                                        AcctStartTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
                                        AcctStartDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_start = '%{Connect-Info}' \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress = '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime IS NULL"
                }
 
@@ -261,9 +259,7 @@ accounting {
                                                ('%{%{Acct-Input-Gigawords}:-0}' * 4294967296), \
                                        AcctOutputOctets = '%{Acct-Output-Octets}' +  \
                                                ('%{%{Acct-Output-Gigawords}:-0}' * 4294967296) \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress= '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime IS NULL"
 
                        query = "\
@@ -314,9 +310,7 @@ accounting {
                                        AcctTerminateCause = '%{Acct-Terminate-Cause}', \
                                        AcctStopDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_stop = '%{Connect-Info}' \
-                               WHERE AcctSessionId = '%{Acct-Session-Id}' \
-                               AND UserName = '%{SQL-User-Name}' \
-                               AND NASIPAddress = '%{NAS-IP-Address}' \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
                                AND AcctStopTime IS NULL"
 
                        query = "\

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 0c6e489..4167737 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -218,15 +218,6 @@ group_membership_query = "\
 accounting {
        reference = "%{tolower:type.%{%{Acct-Status-Type}:-none}.query}"
 
-       session_identifier="(AcctUniqueId = '%{Acct-Unique-Session-Id}')"
-
-# Old method of identifying a session, should only be used for backwards
-# compatibility (and even then it's probably ok to use AcctUniqueId).
-#      session_identifier="\
-#              (AcctSessionId = '%{Acct-Session-Id}' \
-#              AND UserName = '%{SQL-User-Name}' \
-#              AND NASIPAddress = '%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}}')"
-
        # Write SQL queries to a logfile. This is potentially useful for bulk inserts
        # when used with the rlm_sql_null driver.
 #      logfile = ${logdir}/accounting.sql
@@ -293,7 +284,7 @@ accounting {
                                        AcctStartTime = TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        AcctUpdateTime = TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        ConnectInfo_start = '%{Connect-Info}' \
-                               WHERE ${...session_identifier} \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}' \
                                AND AcctStopTime IS NULL"
 
                        # and again where we don't have "AND AcctStopTime IS NULL"
@@ -303,7 +294,7 @@ accounting {
                                        AcctStartTime = TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        AcctUpdateTime = TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        ConnectInfo_start = '%{Connect-Info}' \
-                               WHERE ${...session_identifier}"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
                }
 
                interim-update {
@@ -318,7 +309,7 @@ accounting {
                                                '%{%{Acct-Input-Octets}:-0}'::bigint), \
                                        AcctOutputOctets = (('%{%{Acct-Output-Gigawords}:-0}'::bigint << 32) + \
                                                '%{%{Acct-Output-Octets}:-0}'::bigint) \
-                               WHERE ${...session_identifier} \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}' \
                                AND AcctStopTime IS NULL"
 
                        query = "\
@@ -366,7 +357,7 @@ accounting {
                                        AcctTerminateCause = '%{Acct-Terminate-Cause}', \
                                        FramedIPAddress = NULLIF('%{Framed-IP-Address}', '')::inet, \
                                        ConnectInfo_stop = '%{Connect-Info}' \
-                               WHERE ${...session_identifier} \
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}' \
                                AND AcctStopTime IS NULL"
 
                        query = "\
@@ -413,7 +404,7 @@ accounting {
                                        AcctTerminateCause = '%{Acct-Terminate-Cause}', \
                                        FramedIPAddress = NULLIF('%{Framed-IP-Address}', '')::inet, \
                                        ConnectInfo_stop = '%{Connect-Info}' \
-                               WHERE ${...session_identifier}"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
                }
 
                #

diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index be143aa..4c06545 100644 (file)
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -261,9 +261,7 @@ accounting {
                                        acctstarttime   = %{%{integer:Event-Timestamp}:-date('now')}, \
                                        acctupdatetime  = %{%{integer:Event-Timestamp}:-date('now'))}, \
                                        connectinfo_start = '%{Connect-Info}' \
-                               WHERE acctsessionid = '%{Acct-Session-Id}' \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
                }
 
                interim-update {
@@ -283,9 +281,7 @@ accounting {
                                                << 32 | %{%{Acct-Input-Octets}:-0}, \
                                        acctoutputoctets = %{%{Acct-Output-Gigawords}:-0} \
                                                << 32 | %{%{Acct-Output-Octets}:-0} \
-                               WHERE acctsessionid     = '%{Acct-Session-Id}' \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
 
                        #
                        #  The update condition matched no existing sessions. Use
@@ -335,9 +331,7 @@ accounting {
                                                << 32 | %{%{Acct-Output-Octets}:-0}, \
                                        acctterminatecause = '%{Acct-Terminate-Cause}', \
                                        connectinfo_stop = '%{Connect-Info}' \
-                               WHERE acctsessionid     = '%{Acct-Session-Id}' \
-                               AND username            = '%{SQL-User-Name}' \
-                               AND nasipaddress        = '%{NAS-IP-Address}'"
+                               WHERE AcctUniqueId = '%{Acct-Unique-Session-Id}'"
 
                        #
                        #  The update condition matched no existing sessions. Use