mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
cleanup
This commit is contained in:
parent
6341c93d77
commit
dc5a7f8030
1 changed files with 3 additions and 3 deletions
|
@ -629,10 +629,10 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh,
|
|||
if (passwd_len == acl_user_tmp->salt_len)
|
||||
{
|
||||
if (acl_user_tmp->salt_len == 0 ||
|
||||
(acl_user_tmp->salt_len == SCRAMBLE_LENGTH &&
|
||||
check_scramble(passwd, thd->scramble, acl_user_tmp->salt) == 0) ||
|
||||
(acl_user_tmp->salt_len == SCRAMBLE_LENGTH ?
|
||||
check_scramble(passwd, thd->scramble, acl_user_tmp->salt) :
|
||||
check_scramble_323(passwd, thd->scramble,
|
||||
(ulong *) acl_user_tmp->salt) == 0)
|
||||
(ulong *) acl_user_tmp->salt)) == 0)
|
||||
{
|
||||
acl_user= acl_user_tmp;
|
||||
res= 0;
|
||||
|
|
Loading…
Reference in a new issue