Mercurial > dropbear
changeset 895:5608a5a61c2a
Change port separator to ^ since % is used in ipv6 addresses
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 15 Feb 2014 21:42:35 +0800 |
| parents | 7032deca6b90 |
| children | a1a97e98b0c1 |
| files | cli-runopts.c dbclient.1 |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cli-runopts.c Sat Feb 15 21:23:41 2014 +0800 +++ b/cli-runopts.c Sat Feb 15 21:42:35 2014 +0800 @@ -617,7 +617,7 @@ cli_opts.username = m_strdup(cli_opts.own_user); } - port = strchr(cli_opts.remotehost, '%'); + port = strchr(cli_opts.remotehost, '^'); if (!port) { /* legacy separator */ port = strchr(cli_opts.remotehost, '/');
--- a/dbclient.1 Sat Feb 15 21:23:41 2014 +0800 +++ b/dbclient.1 Sat Feb 15 21:42:35 2014 +0800 @@ -15,7 +15,7 @@ .B dbclient [ .I args ] -.I [user1]@host1[%port1],[user2]@host2[%port2],... +.I [user1]@host1[^port1],[user2]@host2[^port2],... .SH DESCRIPTION .B dbclient @@ -26,7 +26,7 @@ .B \-p \fIport Connect to .I port -on the remote host. Alternatively a port can be specified as hostname%port. +on the remote host. Alternatively a port can be specified as hostname^port. Default is 22. .TP .B \-i \fIidfile @@ -127,7 +127,7 @@ this case a connection will be made to the first host, then a TCP forwarded connection will be made through that to the second host, and so on. Hosts other than the final destination will not see anything other than the encrypted SSH stream. -A port for a host can be specified with a hash (eg matt@martello%44 ). +A port for a host can be specified with a hash (eg matt@martello^44 ). This syntax can also be used with scp or rsync (specifying dbclient as the ssh/rsh command). A file can be "bounced" through multiple SSH hops, eg