changeset 783:34e69908b3f7

Use '#' for host#port separator, document it. This fixes scp in multihop
author Matt Johnston <matt@ucc.asn.au>
date Wed, 17 Apr 2013 22:48:43 +0800
parents e0084f136cb8
children 0e5ea6812bb7
files cli-runopts.c dbclient.1
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cli-runopts.c	Wed Apr 17 22:29:18 2013 +0800
+++ b/cli-runopts.c	Wed Apr 17 22:48:43 2013 +0800
@@ -610,7 +610,11 @@
 		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, '/');
+	}
 	if (port) {
 		*port = '\0';
 		cli_opts.remoteport = port+1;
--- a/dbclient.1	Wed Apr 17 22:29:18 2013 +0800
+++ b/dbclient.1	Wed Apr 17 22:48:43 2013 +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
@@ -24,10 +24,9 @@
 .SH OPTIONS
 .TP
 .B \-p \fIport
-Remote port.
-Connect to port
+Connect to 
 .I port
-on the remote host.
+on the remote host. Alternatively a port can be specified as hostname#port.
 Default is 22.
 .TP
 .B \-i \fIidfile
@@ -127,7 +126,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 slash (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