From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 23 Aug 2023 14:23:09 +0000 (-0400)
Subject: respect group_attribute and update it to sql.group
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3663bae0f8727a2c19b32b4c6f882d4a3b363e5a;p=thirdparty%2Ffreeradius-server.git

respect group_attribute and update it to sql.group
---

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index bd5b51ef4e4..2afae3e5a7f 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1111,7 +1111,9 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 			goto error;
 		}
 
-		if (cf_section_name2(conf)) {
+		if (inst->config.group_attribute) {
+			group_attribute = inst->config.group_attribute;
+		} else if (cf_section_name2(conf)) {
 			snprintf(buffer, sizeof(buffer), "%s.group", mctx->inst->name);
 			group_attribute = buffer;
 		} else {
diff --git a/src/tests/modules/sql_mysql/module.conf b/src/tests/modules/sql_mysql/module.conf
index 7392c1ce824..6d6efecee56 100644
--- a/src/tests/modules/sql_mysql/module.conf
+++ b/src/tests/modules/sql_mysql/module.conf
@@ -38,7 +38,7 @@ sql {
 	}
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attribute = "SQL-Group"
+	group_attribute = "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 e03bd7c47c0..142d81b6717 100644
--- a/src/tests/modules/sql_postgresql/module.conf
+++ b/src/tests/modules/sql_postgresql/module.conf
@@ -38,7 +38,7 @@ sql {
 	}
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attribute = "SQL-Group"
+	group_attribute = "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 3a5f75c87a6..c11889bea74 100644
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -38,7 +38,7 @@ sql {
 	}
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attribute = "SQL-Group"
+	group_attribute = "sql.group"
 
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf