mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-19949 mariabackup option of '--password' or '-p' without specifying password in commandline

Browse source 
password handling as in other command-line tools
This commit is contained in:
Sergei Golubchik 2024-04-29 22:41:07 +02:00
parent cd0356a764
commit 91fb8b7fd3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extra/mariabackup/xtrabackup.cc
View file

@ -370,6 +370,7 @@ my_bool opt_no_backup_locks = FALSE;
my_bool opt_decompress = FALSE; my_bool opt_decompress = FALSE;
my_bool opt_remove_original; my_bool opt_remove_original;
my_bool opt_log_innodb_page_corruption; my_bool opt_log_innodb_page_corruption;
my_bool tty_password= FALSE;
my_bool opt_lock_ddl_per_table = FALSE; my_bool opt_lock_ddl_per_table = FALSE;
static my_bool opt_check_privileges; static my_bool opt_check_privileges;
@ -1367,7 +1368,7 @@ struct my_option xb_client_options[]= {
"This option specifies the password to use " "This option specifies the password to use "
"when connecting to the database. It accepts a string argument. " "when connecting to the database. It accepts a string argument. "
"See mysql --help for details.", "See mysql --help for details.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"protocol", OPT_PROTOCOL, {"protocol", OPT_PROTOCOL,
"The protocol to use for connection (tcp, socket, pipe, memory).", 0, 0, "The protocol to use for connection (tcp, socket, pipe, memory).", 0, 0,
@ -2043,6 +2044,7 @@ xb_get_one_option(const struct my_option *opt,
break; break;
case 'p': case 'p':
opt_password = argument; opt_password = argument;
tty_password = argument == NULL;
break; break;
case OPT_PROTOCOL: case OPT_PROTOCOL:
if (argument) if (argument)
@ -6749,6 +6751,8 @@ void handle_options(int argc, char **argv, char ***argv_server,
if (*start) if (*start)
start[1]= 0; start[1]= 0;
} }
else if (tty_password)
opt_password= my_get_tty_password(NullS);
/* 4) Process --mysqld-args options, ignore unknown options */ /* 4) Process --mysqld-args options, ignore unknown options */