database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix "mysqladmin password" to use correct password scrambling function when

Browse Source 
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)


client/mysqladmin.cc:
  Check old_passwords from server, and use that to determine
  which scramble function to use (except in the case of the
  old-password command, which always use the old scramble function).
This commit is contained in:
unknown
2005-01-05 21:56:18 +01:00
parent d9adebfa24
commit 190f7a6f45
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/mysqladmin.cc
View File

@ -826,13 +826,39 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
if (argv[1][0]) if (argv[1][0])
{ {
char *pw= argv[1]; char *pw= argv[1];
bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;
#ifdef __WIN__ #ifdef __WIN__
uint pw_len= strlen(pw); uint pw_len= strlen(pw);
if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'') if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
printf("Warning: single quotes were not trimmed from the password by" printf("Warning: single quotes were not trimmed from the password by"
" your command\nline client, as you might have expected.\n"); " your command\nline client, as you might have expected.\n");
#endif #endif
if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD) /*
If we don't already know to use an old-style password, see what
the server is using
*/
if (!old) {
if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {
my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
} else {
MYSQL_RES *res= mysql_store_result(mysql);
if (!res) {
my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
}
if (!mysql_num_rows(res)) {
old= 1;
} else {
MYSQL_ROW row= mysql_fetch_row(res);
old= !strncmp(row[1], "ON", 2);
}
mysql_free_result(res);
}
}
if (old)
make_scrambled_password_323(crypted_pw, pw); make_scrambled_password_323(crypted_pw, pw);
else else
make_scrambled_password(crypted_pw, pw); make_scrambled_password(crypted_pw, pw);