The database schema is now at doc/examples/mssql.sql

diff --git a/raddb/mssql.conf b/raddb/mssql.conf
index 84953ac..0627627 100644 (file)
--- a/raddb/mssql.conf
+++ b/raddb/mssql.conf
@@ -3,40 +3,40 @@
 #
 #  The database schema is available at:
 #
-#   src/radiusd/src/modules/rlm_sql/drivers/rlm_sql_freetds/db_mssql.sql
+#      doc/examples/mssql.sql
 #
-#      $Id$
+#  $Id$
 #
 sql {
 
        # Database type
        # Current supported are: rlm_sql_mysql, rlm_sql_postgresql,
-       # rlm_sql_iodbc, rlm_sql_oracle, rlm_sql_unixodbc, rlm_sql_freetds
-       driver = "rlm_sql_freetds"
+       # rlm_sql_iodbc, rlm_sql_oracle, rlm_sql_unixodbc
+       driver = "rlm_sql_unixodbc"
 
        # Connect info
        server = "localhost"
        login = "root"
        password = "rootpass"
-       
+
        # Database table configuration
        radius_db = "radius"
-               
+
        # If you want both stop and start records logged to the
        # same SQL table, leave this as is.  If you want them in
        # different tables, put the start table in acct_table1
        # and stop table in acct_table2
        acct_table1 = "radacct"
        acct_table2 = "radacct"
-               
+
        authcheck_table = "radcheck"
        authreply_table = "radreply"
-       
+
        groupcheck_table = "radgroupcheck"
        groupreply_table = "radgroupreply"
-       
+
        usergroup_table = "usergroup"
-       
+
        # Remove stale session if checkrad does not see a double login
        deletestalesessions = yes
 
@@ -55,12 +55,12 @@ sql {
        #######################################################################
        #  Query config:  Username
        #######################################################################
-       # This is the username that will get substituted, escaped, and added 
-       # as attribute 'SQL-User-Name'.  '%{SQL-User-Name}' should be used below 
-       # everywhere a username substitution is needed so you you can be sure 
-       # the username passed from the client is escaped properly.  
+       # This is the username that will get substituted, escaped, and added
+       # as attribute 'SQL-User-Name'.  '%{SQL-User-Name}' should be used
+       # below everywhere a username substitution is needed so you you can
+       # be sure the username passed from the client is escaped properly.
        #
-       #  Uncomment the next line, if you want the sql_user_name to mean:
+       # Uncomment the next line, if you want the sql_user_name to mean:
        #
        #    Use Stripped-User-Name, if it's there.
        #    Else use User-Name, if it's there,
@@ -74,9 +74,9 @@ sql {
        #  Authorization Queries
        #######################################################################
        #  These queries compare the check items for the user
-       #  in ${authcheck_table} and setup the reply items in 
+       #  in ${authcheck_table} and setup the reply items in
        #  ${authreply_table}.  You can use any query/tables
-       #  you want, but the return data for each row MUST 
+       #  you want, but the return data for each row MUST
        #  be in the  following order:
        #
        #  0. Row ID (currently unused)
@@ -98,15 +98,15 @@ sql {
        #######################################################################
        #  Accounting Queries
        #######################################################################
-       # accounting_onoff_query        - query for Accounting On/Off packets 
-       # accounting_update_query       - query for Accounting update packets 
-       # accounting_update_query_alt   - query for Accounting update packets 
+       # accounting_onoff_query        - query for Accounting On/Off packets
+       # accounting_update_query       - query for Accounting update packets
+       # accounting_update_query_alt   - query for Accounting update packets
        #                               (alternate in case first query fails)
-       # accounting_start_query        - query for Accounting start packets 
-       # accounting_start_query_alt    - query for Accounting start packets 
+       # accounting_start_query        - query for Accounting start packets
+       # accounting_start_query_alt    - query for Accounting start packets
        #                               (alternate in case first query fails)
-       # accounting_stop_query         - query for Accounting stop packets 
-       # accounting_stop_query_alt     - query for Accounting start packets 
+       # accounting_stop_query         - query for Accounting stop packets
+       # accounting_stop_query_alt     - query for Accounting start packets
        #                               (alternate in case first query doesn't
        #                                affect any existing rows in the table)
        #######################################################################
@@ -116,7 +116,7 @@ sql {
 
        accounting_update_query_alt = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctSessionTime, AcctAuthentic, ConnectInfo_start, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay) values('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%{Acct-Session-Time}', '%{Acct-Authentic}', '', '%{Acct-Input-Octets}', '%{Acct-Output-Octets}', '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '0')"
 
-       # accounting_start_query: Inserting of RadAcctId and AcctStopTime was 
+       # accounting_start_query: Inserting of RadAcctId and AcctStopTime was
        # removed. These fields are processing by a database
        accounting_start_query = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctStartTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, AcctStopDelay) values('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%S', '0', '%{Acct-Authentic}', '%{Connect-Info}', '', '0', '0', '%{Called-Station-Id}', '%{Calling-Station-Id}', '', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '%{Acct-Delay-Time}', '0')"