Enable simul_count_query

There's no reason to disable it in the default configuration.

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 75611ad6f78e0c9ae611059c3c81690be15e36d1..40508024d5fd6a319bbb85775c3fe1e8388be656 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -163,14 +163,11 @@ authorize_group_reply_query = "\
 #                      - Note that the returned field order should not be changed.
 #######################################################################
 
-#
-#  Uncomment simul_count_query to enable simultaneous use checking
-#
-#simul_count_query = "\
-#      SELECT COUNT(*) \
-#      FROM ${acct_table1} \
-#      WHERE username = '%{SQL-User-Name}' \
-#      AND acctstoptime IS NULL"
+simul_count_query = "\
+       SELECT COUNT(*) \
+       FROM ${acct_table1} \
+       WHERE username = '%{SQL-User-Name}' \
+       AND acctstoptime IS NULL"
 
 simul_verify_query = "\
        SELECT \

diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index 2df2d3b8ae6392d790ecda405f4d013b8a53f415..387bcf97daa51b838b8d8bdddc9f279f538014b6 100644 (file)
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -133,14 +133,11 @@ authorize_group_reply_query = "\
 #                      - Note that the returned field order should not be changed.
 #######################################################################
 
-#
-#  Uncomment simul_count_query to enable simultaneous use checking
-#
-#simul_count_query = "\
-#      SELECT COUNT(*) \
-#      FROM ${acct_table1} \
-#      WHERE UserName = '%{SQL-User-Name}' \
-#      AND AcctStopTime IS NULL"
+simul_count_query = "\
+       SELECT COUNT(*) \
+       FROM ${acct_table1} \
+       WHERE UserName = '%{SQL-User-Name}' \
+       AND AcctStopTime IS NULL"
 
 simul_verify_query = "\
        SELECT \

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 962f4f00b66f676cf6afed5ae15cb4dffe3b515d..c33581cf75503b08b921f4a8224b107ed2a20c68 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -166,21 +166,18 @@ authorize_group_reply_query = "\
 #                       - Note that the returned field order should not be changed.
 #######################################################################
 
-#
-#  Uncomment simul_count_query to enable simultaneous use checking
-#
-#simul_count_query = "\
-#      SELECT COUNT(*) \
-#      FROM ${acct_table1} \
-#      WHERE UserName='%{SQL-User-Name}' \
-#      AND AcctStopTime IS NULL"
-
-#simul_verify_query = "\
-#      SELECT RadAcctId, AcctSessionId, UserName, NASIPAddress, NASPortId, FramedIPAddress, CallingStationId, \
-#              FramedProtocol \
-#      FROM ${acct_table1} \
-#      WHERE UserName='%{SQL-User-Name}' \
-#      AND AcctStopTime IS NULL"
+simul_count_query = "\
+       SELECT COUNT(*) \
+       FROM ${acct_table1} \
+       WHERE UserName='%{SQL-User-Name}' \
+       AND AcctStopTime IS NULL"
+
+simul_verify_query = "\
+       SELECT RadAcctId, AcctSessionId, UserName, NASIPAddress, NASPortId, FramedIPAddress, CallingStationId, \
+               FramedProtocol \
+       FROM ${acct_table1} \
+       WHERE UserName='%{SQL-User-Name}' \
+       AND AcctStopTime IS NULL"
 
 #######################################################################
 # Group Membership Queries

diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index ae1f8be293c6433cd560815fc5456cdc488a185d..b4118c22a60c1087ca0e528f5c6d2a682b711bde 100644 (file)
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -153,14 +153,11 @@ authorize_group_reply_query = "\
 #                      - Note that the returned field order should not be changed.
 #######################################################################
 
-#
-#  Uncomment simul_count_query to enable simultaneous use checking
-#
-#simul_count_query = "\
-#      SELECT COUNT(*) \
-#      FROM ${acct_table1} \
-#      WHERE username = '%{SQL-User-Name}' \
-#      AND acctstoptime IS NULL"
+simul_count_query = "\
+       SELECT COUNT(*) \
+       FROM ${acct_table1} \
+       WHERE username = '%{SQL-User-Name}' \
+       AND acctstoptime IS NULL"
 
 simul_verify_query = "\
        SELECT radacctid, acctsessionid, username, nasipaddress, nasportid, framedipaddress, \