Commit 29b3ae4d authored by unknown's avatar unknown

Fix for Bug#6377 "Password Generation Discrepancy"


client/mysqladmin.cc:
  Fix for Bug#6377 "Password Generation Discrepancy":
  this is not a MySQL bug.
  The problem is that Windows command line client doesn't trim single quotes
  from arguments, as any UNIX shell does.
  The fix just checks for this condition and gives a warning if it is true.
parent 33a4b35e
...@@ -825,10 +825,17 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) ...@@ -825,10 +825,17 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
} }
if (argv[1][0]) if (argv[1][0])
{ {
char *pw= argv[1];
#ifdef __WIN__
uint pw_len= strlen(pw);
if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
printf("Warning: single quotes were not trimmed from the password by"
" your command\nline client, as you might have expected.\n");
#endif
if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD) if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD)
make_scrambled_password_323(crypted_pw, argv[1]); make_scrambled_password_323(crypted_pw, pw);
else else
make_scrambled_password(crypted_pw, argv[1]); make_scrambled_password(crypted_pw, pw);
} }
else else
crypted_pw[0]=0; /* No password */ crypted_pw[0]=0; /* No password */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment