From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 26 Jun 2015 18:54:41 +0000 (-0400)
Subject: Update the default configuration to specify sql-group in a saner way.
X-Git-Tag: release_3_0_9~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b51ecab5cdafd529e5a7c0715582dc598a4fd413;p=thirdparty%2Ffreeradius-server.git

Update the default configuration to specify sql-group in a saner way.
---

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index a005045a709..272d7d0e6e0 100644
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -230,6 +230,18 @@ sql {
 	# Table to keep radius client info
 	client_table = "nas"
 
+	#
+	# The group attribute specific to this instance of rlm_sql
+	#
+
+	# This entry should be used for additional instances (sql foo {})
+	# of the SQL module.
+#	group_attr = "${.:instance}-SQL-Group"
+
+	# This entry should be used for the default instance (sql {})
+	# of the SQL module.
+	group_attr = "SQL-Group"
+
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
 }
diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 8268abd5e2d..ecd2f329f9c 100644
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -141,14 +141,14 @@ authorize_group_check_query = "\
 	SELECT id, groupname, attribute, \
 	Value, op \
 	FROM ${groupcheck_table} \
-	WHERE groupname = '%{Sql-Group}' \
+	WHERE groupname = '%{${group_attr}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, groupname, attribute, \
 	value, op \
 	FROM ${groupreply_table} \
-	WHERE groupname = '%{Sql-Group}' \
+	WHERE groupname = '%{${group_attr}}' \
 	ORDER BY id"
 
 #######################################################################
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 8496e493e8c..429814f492e 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -146,13 +146,13 @@ authorize_reply_query = "\
 authorize_group_check_query = "\
 	SELECT id, GroupName, Attribute, Value, op \
 	FROM ${groupcheck_table} \
-	WHERE GroupName = '%{Sql-Group}' \
+	WHERE GroupName = '%{${group_attr}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, GroupName, Attribute, Value, op \
 	FROM ${groupreply_table} \
-	WHERE GroupName = '%{Sql-Group}' \
+	WHERE GroupName = '%{${group_attr}}' \
 	ORDER BY id"
 
 #######################################################################
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index 320604fcff1..86c1380ef66 100644
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -131,14 +131,14 @@ authorize_group_check_query = "\
 	SELECT id, groupname, attribute, \
 	Value, op \
 	FROM ${groupcheck_table} \
-	WHERE groupname = '%{Sql-Group}' \
+	WHERE groupname = '%{${group_attr}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, groupname, attribute, \
 	value, op \
 	FROM ${groupreply_table} \
-	WHERE groupname = '%{Sql-Group}' \
+	WHERE groupname = '%{${group_attr}}' \
 	ORDER BY id"
 
 #######################################################################
@@ -166,7 +166,7 @@ simul_verify_query = "\
 	SELECT radacctid, acctsessionid, username, nasipaddress, nasportid, framedipaddress, \
 		callingstationid, framedprotocol \
 	FROM ${acct_table1} \
-	WHERE username = '%{SQL-User-Name}' \
+	WHERE username = '%{${group_attr}}' \
 	AND acctstoptime IS NULL"
 
 #######################################################################
diff --git a/src/tests/modules/sql_mysql/module.conf b/src/tests/modules/sql_mysql/module.conf
index 08a327079e3..6511d9d6cd7 100644
--- a/src/tests/modules/sql_mysql/module.conf
+++ b/src/tests/modules/sql_mysql/module.conf
@@ -45,6 +45,9 @@ sql {
 	# Table to keep radius client info
 	client_table = "nas"
 
+	# The group attribute specific to this instance of rlm_sql
+	group_attr = "SQL-Group"
+
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
 }
diff --git a/src/tests/modules/sql_postgresql/module.conf b/src/tests/modules/sql_postgresql/module.conf
index 2d2c82cd397..0b28c11fa6d 100644
--- a/src/tests/modules/sql_postgresql/module.conf
+++ b/src/tests/modules/sql_postgresql/module.conf
@@ -44,6 +44,9 @@ sql {
 	# Table to keep radius client info
 	client_table = "nas"
 
+	# The group attribute specific to this instance of rlm_sql
+	group_attr = "SQL-Group"
+
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
 }
diff --git a/src/tests/modules/sql_sqlite/module.conf b/src/tests/modules/sql_sqlite/module.conf
index 2dbeb570b7d..bc5f277eb7a 100644
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -44,6 +44,9 @@ sql {
 	# Table to keep radius client info
 	client_table = "nas"
 
+	# The group attribute specific to this instance of rlm_sql
+	group_attr = "SQL-Group"
+
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
 }