summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2013-04-17 23:17:27 +0800
committerMatt Johnston <matt@ucc.asn.au>2013-04-17 23:17:27 +0800
commitb00bb9f855737cb38fbeb1ad70a7d846026ec9fc (patch)
tree50b59be05a951e463af8d31fad00919a6c5fb1f9
parent6a83cde43b6af028c61b88e847c9bc3d076ee2a0 (diff)
downloaddropbear-b00bb9f855737cb38fbeb1ad70a7d846026ec9fc.tar.gz
Use % rather than # for port delimiter
-rw-r--r--cli-runopts.c2
-rw-r--r--dbclient.16
2 files changed, 4 insertions, 4 deletions
diff --git a/cli-runopts.c b/cli-runopts.c
index 62568b0..91a2f42 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 2379e4a..7ad550f 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