Move the "read_groups" and "read_clients" items to the top.

	This way, all query definitions are at the bottom, while
	config items are at the top of the file. (closes #276)

	Patch from Thor Spruyt <thor.spruyt@telenet.be>

diff --git a/raddb/oraclesql.conf b/raddb/oraclesql.conf
index 2ae044c..9062395 100644 (file)
--- a/raddb/oraclesql.conf
+++ b/raddb/oraclesql.conf
@@ -7,6 +7,7 @@
 #
 #      $Id$
 #
+
 sql {
 
        # Database type
@@ -35,8 +36,13 @@ sql {
        groupcheck_table = "radgroupcheck"
        groupreply_table = "radgroupreply"
        
+       # Table to keep group info
        usergroup_table = "usergroup"
        
+       # If set to 'yes' (default) we read the group tables
+       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
+       #read_groups = yes
+
        # Remove stale session if checkrad does not see a double login
        deletestalesessions = yes
 
@@ -187,10 +193,6 @@ accounting_update_query = "UPDATE ${acct_table1} \
        # group_membership_query        - Check user group membership
        #######################################################################
 
-       #
-       # If set to 'yes' (default) we read the group tables
-       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
-       #read_groups = yes
-
        group_membership_query = "SELECT GroupName FROM ${usergroup_table} WHERE UserName='%{SQL-User-Name}'"
+
 }

diff --git a/raddb/postgresql.conf b/raddb/postgresql.conf
index 9e25570..28d980b 100644 (file)
--- a/raddb/postgresql.conf
+++ b/raddb/postgresql.conf
@@ -41,11 +41,19 @@ sql {
        groupcheck_table = "radgroupcheck"
        groupreply_table = "radgroupreply"
        
+       # Table to keep group info
        usergroup_table = "usergroup"
 
-       #table to keep radius client info
+       # If set to 'yes' (default) we read the group tables
+       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
+       #read_groups = yes
+
+       # Table to keep radius client info
        nas_table = "nas"
 
+       # Set to 'yes' to read radius clients from the database ('nas' table)
+       #readclients = yes
+
        # Remove stale session if checkrad does not see a double login
        deletestalesessions = yes
 
@@ -286,10 +294,6 @@ sql {
 
   group_membership_query = "SELECT GroupName FROM ${usergroup_table} WHERE UserName='%{SQL-User-Name}' ORDER BY priority"
 
-       # If set to 'yes' (default) we read the group tables
-       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
-       #read_groups = yes
-
        #######################################################################
        # Authentication Logging Queries
        #######################################################################
@@ -298,8 +302,4 @@ sql {
   postauth_query = "INSERT INTO ${postauth_table} (username, pass, reply, authdate) \
     values ('%{User-Name}', '%{User-Password:-Chap-Password}', '%{reply:Packet-Type}', NOW())"
 
-       #
-       #Set to 'yes' to read radius clients from the database ('nas' table)
-       #readclients = yes
-
 }

diff --git a/raddb/sql.conf b/raddb/sql.conf
index ed3bbe6..faa35b0 100644 (file)
--- a/raddb/sql.conf
+++ b/raddb/sql.conf
@@ -11,7 +11,9 @@
 #
 #      $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
@@ -41,11 +43,19 @@ sql {
        groupcheck_table = "radgroupcheck"
        groupreply_table = "radgroupreply"
 
+       # Table to keep group info
        usergroup_table = "usergroup"
 
+       # If set to 'yes' (default) we read the group tables
+       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
+       #read_groups = yes
+
        # Table to keep radius client info
        nas_table = "nas"
 
+       # Set to 'yes' to read radius clients from the database ('nas' table)
+       #readclients = yes
+
        # Remove stale session if checkrad does not see a double login
        deletestalesessions = yes
 
@@ -231,11 +241,6 @@ sql {
 
        group_membership_query = "SELECT GroupName FROM ${usergroup_table} WHERE UserName='%{SQL-User-Name}' ORDER BY priority"
 
-       #
-       # If set to 'yes' (default) we read the group tables
-       # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table
-       #read_groups = yes
-
        #######################################################################
        # Authentication Logging Queries
        #######################################################################
@@ -244,7 +249,4 @@ sql {
 
        postauth_query = "INSERT into ${postauth_table} (id, user, pass, reply, date) values ('', '%{User-Name}', '%{User-Password:-Chap-Password}', '%{reply:Packet-Type}', '%S')"
 
-       #
-       # Set to 'yes' to read radius clients from the database ('nas' table)
-       #readclients = yes
 }