From f98eb5808bd5fbdf7463f2d7233bb3cc52b12f89 Mon Sep 17 00:00:00 2001 From: Matt Johnston <matt@ucc.asn.au> Date: Wed, 17 Apr 2013 23:17:27 +0800 Subject: [PATCH] Use % rather than # for port delimiter --- cli-runopts.c | 2 +- dbclient.1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli-runopts.c b/cli-runopts.c index 62568b0b..91a2f421 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -610,7 +610,7 @@ static void parse_hostname(const char* orighostarg) { 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, '/'); diff --git a/dbclient.1 b/dbclient.1 index 2379e4a9..7ad550fb 100644 --- a/dbclient.1 +++ b/dbclient.1 @@ -15,7 +15,7 @@ dbclient \- lightweight SSH2 client .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 @@ environments, while still being functional and secure enough for general use. .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 @@ -126,7 +126,7 @@ Dropbear will also allow multiple "hops" to be specified, separated by commas. I 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 -- GitLab