Skip to content

Commit afef60d

Browse files
Marek Młynarskirennox
authored andcommitted
BUG#33459870 Password is not accepted in URI for --ssh option
This commit fixes incorrect help message for ssh option in mysql shell. Change-Id: Idb0843488487b5c8270537bccf8e67e2db195542
1 parent ada5abf commit afef60d

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

mysqlshdk/shellcore/shell_options.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Shell_options::Shell_options(
306306
add_startup_options(true)
307307
(cmdline("--ssh=<value>"), "Make SSH tunnel connection using"
308308
"Uniform Resource Identifier. "
309-
"Format: [user[:pass]@]host[:port]")
309+
"Format: [user@]host[:port]")
310310
(&storage.ssh.identity_file, "", cmdline("--ssh-identity-file=<file>"),
311311
"File from which the private key for public key authentication is "
312312
"read.",

src/mysqlsh/mysql_shell.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ REGISTER_HELP(
286286
"If TYPE is omitted, automatic protocol detection is done, unless the "
287287
"protocol is given in the URI.");
288288
REGISTER_HELP(CMD_CONNECT_DETAIL5,
289-
"URI and SSHURI format is: [user[:password]@]hostname[:port]");
289+
"URI format is: [user[:password]@]hostname[:port] and SSHURI "
290+
"format is: [user@]hostname[:port]");
290291
REGISTER_HELP(CMD_CONNECT_EXAMPLE, "<b>\\connect --mx</b> root@localhost");
291292
REGISTER_HELP(
292293
CMD_CONNECT_EXAMPLE_DESC,

unittest/scripts/auto/js_shell/validation/cmd_help_commands_norecord.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ DESCRIPTION
2727
If TYPE is omitted, automatic protocol detection is done, unless the
2828
protocol is given in the URI.
2929

30-
URI and SSHURI format is: [user[:password]@]hostname[:port]
30+
URI format is: [user[:password]@]hostname[:port] and SSHURI format is:
31+
[user@]hostname[:port]
3132

3233
EXAMPLE
3334
\connect --mx root@localhost

unittest/scripts/auto/js_shell/validation/mysqlsh_help_norecord.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Usage: mysqlsh [OPTIONS] [URI]
2929
arguments of the processed file.
3030
--ssh=<value> Make SSH tunnel connection usingUniform
3131
Resource Identifier. Format:
32-
[user[:pass]@]host[:port]
32+
[user@]host[:port]
3333
--ssh-identity-file=<file> File from which the private key for public
3434
key authentication is read.
3535
--ssh-config-file=<file> Specify a custom path for SSH configuration.

0 commit comments

Comments
 (0)