summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2014-02-15 21:42:35 +0800
committerMatt Johnston <matt@ucc.asn.au>2014-02-15 21:42:35 +0800
commitf00edd79fcefbf37194c5bee972bc81a1479b051 (patch)
tree5432740cd6ee0c058e38bce61a6e24cee9a2a7dd
parentc7a6710139327c5d819d68d6e6771652d4f6018e (diff)
downloaddropbear-f00edd79fcefbf37194c5bee972bc81a1479b051.tar.gz
Change port separator to ^ since % is used in ipv6 addresses
-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 9877740..d8b250a 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -617,7 +617,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 4839982..a6dff62 100644
--- a/dbclient.1
+++ b/dbclient.1
@@ -15,7 +15,7 @@ dbclient \- lightweight SSH 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
@@ -127,7 +127,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