mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

handle a case when a user connects with a password to a passwordless account

Browse source
This commit is contained in:
Sergei Golubchik 2010-06-02 17:53:12 +02:00
commit cdebfd3892
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_acl.cc
View file

@ -8217,7 +8217,8 @@ static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio,
info->password_used = 1;
if (pkt_len == SCRAMBLE_LENGTH)
return check_scramble(pkt, thd->scramble, mpvio->acl_user->salt) ?
return info->auth_string[0] == 0 ||
check_scramble(pkt, thd->scramble, mpvio->acl_user->salt) ?
CR_ERROR : CR_OK;
inc_host_errors(&mpvio->thd->net.vio->remote.sin_addr);
@ -8268,7 +8269,8 @@ static int old_password_authenticate(MYSQL_PLUGIN_VIO *vio,
info->password_used = 1;
if (pkt_len == SCRAMBLE_LENGTH_323)
return check_scramble_323(pkt, thd->scramble,
return info->auth_string[0] == 0 ||
check_scramble_323(pkt, thd->scramble,
(ulong *)mpvio->acl_user->salt) ? CR_ERROR : CR_OK;
inc_host_errors(&mpvio->thd->net.vio->remote.sin_addr);