group_attribute not group_attr

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index 272d7d0..05e3e0b 100644 (file)
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -236,11 +236,11 @@ sql {
 
        # This entry should be used for additional instances (sql foo {})
        # of the SQL module.
-#      group_attr = "${.:instance}-SQL-Group"
+#      group_attribute = "${.:instance}-SQL-Group"
 
        # This entry should be used for the default instance (sql {})
        # of the SQL module.
-       group_attr = "SQL-Group"
+       group_attribute = "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 ecd2f32..f008d95 100644 (file)
--- 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 = '%{${group_attr}}' \
+       WHERE groupname = '%{${group_attribute}}' \
        ORDER BY id"
 
 authorize_group_reply_query = "\
        SELECT id, groupname, attribute, \
        value, op \
        FROM ${groupreply_table} \
-       WHERE groupname = '%{${group_attr}}' \
+       WHERE groupname = '%{${group_attribute}}' \
        ORDER BY id"
 
 #######################################################################

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 429814f..962f4f0 100644 (file)
--- 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 = '%{${group_attr}}' \
+       WHERE GroupName = '%{${group_attribute}}' \
        ORDER BY id"
 
 authorize_group_reply_query = "\
        SELECT id, GroupName, Attribute, Value, op \
        FROM ${groupreply_table} \
-       WHERE GroupName = '%{${group_attr}}' \
+       WHERE GroupName = '%{${group_attribute}}' \
        ORDER BY id"
 
 #######################################################################

diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index 86c1380..8717fe6 100644 (file)
--- 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 = '%{${group_attr}}' \
+       WHERE groupname = '%{${group_attribute}}' \
        ORDER BY id"
 
 authorize_group_reply_query = "\
        SELECT id, groupname, attribute, \
        value, op \
        FROM ${groupreply_table} \
-       WHERE groupname = '%{${group_attr}}' \
+       WHERE groupname = '%{${group_attribute}}' \
        ORDER BY id"
 
 #######################################################################
@@ -166,7 +166,7 @@ simul_verify_query = "\
        SELECT radacctid, acctsessionid, username, nasipaddress, nasportid, framedipaddress, \
                callingstationid, framedprotocol \
        FROM ${acct_table1} \
-       WHERE username = '%{${group_attr}}' \
+       WHERE username = '%{${group_attribute}}' \
        AND acctstoptime IS NULL"
 
 #######################################################################

diff --git a/src/tests/modules/sql_mysql/module.conf b/src/tests/modules/sql_mysql/module.conf
index 6511d9d..e3aa02d 100644 (file)
--- a/src/tests/modules/sql_mysql/module.conf
+++ b/src/tests/modules/sql_mysql/module.conf
@@ -46,7 +46,7 @@ sql {
        client_table = "nas"
 
        # The group attribute specific to this instance of rlm_sql
-       group_attr = "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 0b28c11..ee9a8a9 100644 (file)
--- a/src/tests/modules/sql_postgresql/module.conf
+++ b/src/tests/modules/sql_postgresql/module.conf
@@ -45,7 +45,7 @@ sql {
        client_table = "nas"
 
        # The group attribute specific to this instance of rlm_sql
-       group_attr = "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 bc5f277..1d8ac74 100644 (file)
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -45,7 +45,7 @@ sql {
        client_table = "nas"
 
        # The group attribute specific to this instance of rlm_sql
-       group_attr = "SQL-Group"
+       group_attribute = "SQL-Group"
 
        # Read database-specific queries
        $INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf