diff options
| author | serg@serg.mylan <> | 2003-08-07 16:27:05 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-08-07 16:27:05 +0200 |
| commit | e56383eff2dcb858bbcc65de74adeb21cb6eb512 (patch) | |
| tree | 40293ce97256c30c37c972620d7d39e67a312efe /sql | |
| parent | cc843a81ae8a1d8d7ec1e10dfc448375fb71bb8f (diff) | |
| parent | 86e79ec380abe72997db253a55804e3c9edd285a (diff) | |
| download | mariadb-git-e56383eff2dcb858bbcc65de74adeb21cb6eb512.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3a3de2abf10..714a416ab95 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -233,10 +233,10 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) "Found old style password for user '%s'. Ignoring user. (You may want to restart mysqld using --old-protocol)", user.user ? user.user : ""); /* purecov: tested */ } - else if (length % 8) // This holds true for passwords + else if (length % 8 || length > 16) { sql_print_error( - "Found invalid password for user: '%s@%s'; Ignoring user", + "Found invalid password for user: '%s'@'%s'; Ignoring user", user.user ? user.user : "", user.host.hostname ? user.host.hostname : ""); /* purecov: tested */ continue; /* purecov: tested */ |