group_attribute not group_attr

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index 272d7d0e6e037d6212088184f6aa9d71e797668a..05e3e0b6fd6df4e8bb35b0bc2f49727db67dc5b8 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 ecd2f329f9c34f965ce74cc24b61b4024cf5efb5..f008d957d839571d9cf71d6088d83a3c0c0b80fe 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 429814f492e2f42eaed2c17ae41aee47782bde45..962f4f00b66f676cf6afed5ae15cb4dffe3b515d 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 86c1380ef6645f13f0c01d0759abc44921f5f830..8717fe64178947fa914a57b533c6831f53558e53 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 6511d9d6cd73801bd799eef349a9d461172884f2..e3aa02ddea804c63ea1a08c8b16fcc14107c89a6 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 0b28c11fa6d46e34e3b6a6468c0a7c8f89b60d80..ee9a8a9367b92b9ac2c6468d8caeee321c285bcd 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 bc5f277eb7a75853bfe3157d3894821e50e2ffe7..1d8ac74e99fb8c62b10fd63154e1d0b197d2b7f7 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