From 0a7f7d801c6b35ed5b43fd685fbe5b58fc7e55d6 Mon Sep 17 00:00:00 2001
From: nbk <nbk>
Date: Fri, 9 Dec 2005 14:26:44 +0000
Subject: [PATCH] 	Fix the comments about MySQL case sensitive queries:
 the default 	queries are case *insensitive*. (unlike PostgreSQL)

	Remove the warning about slower queries: tests indicate there is
	no significative difference.

	Move group_membership_query above the other authorize_group_*
	queries.
---
 raddb/sql.conf | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/raddb/sql.conf b/raddb/sql.conf
index faa35b0..520a6ea 100644
--- a/raddb/sql.conf
+++ b/raddb/sql.conf
@@ -144,16 +144,18 @@ sql {
 	#  3. Item Attr Value
 	#  4. Item Attr Operation
 	#######################################################################
-	# Use these for case insensitive usernames. WARNING: Slower queries!
+	# Use these for case sensitive usernames.
 #	authorize_check_query = "SELECT id, UserName, Attribute, Value, op \
 #         FROM ${authcheck_table} \
-#         WHERE LOWER(Username) = LOWER('%{SQL-User-Name}') \
+#         WHERE Username = BINARY '%{SQL-User-Name}' \
 #         ORDER BY id"
 #	authorize_reply_query = "SELECT id, UserName, Attribute, Value, op \
 #         FROM ${authreply_table} \
-#         WHERE LOWER(Username) = LOWER('%{SQL-User-Name}') \
+#         WHERE Username = BINARY '%{SQL-User-Name}' \
 #         ORDER BY id"
 
+	# The default queries are case insensitive. (for compatibility with
+	# older versions of FreeRADIUS)
 	authorize_check_query = "SELECT id, UserName, Attribute, Value, op \
           FROM ${authcheck_table} \
           WHERE Username = '%{SQL-User-Name}' \
@@ -163,15 +165,16 @@ sql {
           WHERE Username = '%{SQL-User-Name}' \
           ORDER BY id"
 
-	# Use these for case insensitive usernames. WARNING: Slower queries!
-#	authorize_group_check_query = "SELECT id, GroupName, Attribute, Value, op \
-#         FROM ${groupcheck_table} \
-#         WHERE LOWER(GroupName) = LOWER('%{Sql-Group}') \
-#         ORDER BY id"
-#	authorize_group_reply_query = "SELECT id, GroupName, Attribute, Value, op \
-#         FROM ${groupreply_table} \
-#         WHERE LOWER(GroupName) = LOWER('%{Sql-Group}') \
-#         ORDER BY id"
+	# Use these for case sensitive usernames.
+#	group_membership_query = "SELECT GroupName \
+#         FROM ${usergroup_table} \
+#         WHERE UserName = BINARY '%{SQL-User-Name}' \
+#         ORDER BY priority"
+
+	group_membership_query = "SELECT GroupName \
+          FROM ${usergroup_table} \
+          WHERE UserName = '%{SQL-User-Name}' \
+          ORDER BY priority"
 
 	authorize_group_check_query = "SELECT id, GroupName, Attribute, Value, op \
           FROM ${groupcheck_table} \
@@ -234,14 +237,6 @@ sql {
 	simul_verify_query = "SELECT RadAcctId, AcctSessionId, UserName, NASIPAddress, NASPortId, FramedIPAddress, CallingStationId, FramedProtocol FROM ${acct_table1} WHERE UserName='%{SQL-User-Name}' AND AcctStopTime = 0"
 
 	#######################################################################
-	# Group Membership Queries
-	#######################################################################
-	# group_membership_query	- Check user group membership
-	#######################################################################
-
-	group_membership_query = "SELECT GroupName FROM ${usergroup_table} WHERE UserName='%{SQL-User-Name}' ORDER BY priority"
-
-	#######################################################################
 	# Authentication Logging Queries
 	#######################################################################
 	# postauth_query		- Insert some info after authentication
-- 
2.1.4