From 1858c04d82899d651bbdd031f1a6e5aed83733e8 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Fri, 6 Apr 2012 09:03:26 +0000 Subject: [PATCH] Usermanager: Host may contain uppercase chars, it's just case sensitive, as stated on http://bugs.mysql.com/bug.php?id=19828 . Allow uppercase host names, which may cause errors when selecting such users, but as we have a exit-logic here that does not show AVs to the end user. --- source/usermanager.pas | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/usermanager.pas b/source/usermanager.pas index 38d80ae3..276e739a 100644 --- a/source/usermanager.pas +++ b/source/usermanager.pas @@ -12,7 +12,7 @@ uses type - TUserProblem = (upNone, upEmptyPassword, upInvalidPasswordLen, upUpperHost, upSkipNameResolve, upUnknown); + TUserProblem = (upNone, upEmptyPassword, upInvalidPasswordLen, upSkipNameResolve, upUnknown); TUser = class(TObject) Username, Host, Password, Cipher, Issuer, Subject: String; @@ -325,9 +325,7 @@ begin if not (Length(U.Password) in [0, 16, 41]) then U.Problem := upInvalidPasswordLen else if SkipNameResolve and U.HostRequiresNameResolve then - U.Problem := upSkipNameResolve - else if LowerCase(U.Host) <> U.Host then - U.Problem := upUpperHost; + U.Problem := upSkipNameResolve; FUsers.Add(U); Users.Next; end; @@ -813,8 +811,6 @@ begin Msg := 'This user has an empty password.'; upInvalidPasswordLen: Msg := 'This user is inactive due to an invalid length of its encrypted password. Please fix that in the mysql.user table.'; - upUpperHost: - Msg := 'This user is broken due to uppercase characters in its hostname. Please fix that in the mysql.user table.'; upSkipNameResolve: Msg := 'This user is inactive due to having a host name, while the server runs with --skip-name-resolve.'; upUnknown: