From 1fdfa2ecfdf4d6be72319390cbbfa6ac0cc9d34f Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 5 Nov 2008 13:53:14 +0000
Subject: [PATCH] LICENSE - Update copyright to 2008 cli-runopts.c - mention
that -v is for DEBUG_TRACE, add multihop syntax dbclient.1 - document some
new features
--HG--
extra : convert_revision : 04ca01e638904920e0e16fea06b55c52a9b9b81d
---
LICENSE | 2 +-
cli-runopts.c | 10 +++++++---
dbclient.1 | 34 +++++++++++++++++++++++++++++-----
3 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/LICENSE b/LICENSE
index ec93fa18..ba11d4fc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ The majority of code is written by Matt Johnston, under the license below.
Portions of the client-mode work are (c) 2004 Mihnea Stoenescu, under the
same license:
-Copyright (c) 2002-2006 Matt Johnston
+Copyright (c) 2002-2008 Matt Johnston
Portions copyright (c) 2004 Mihnea Stoenescu
All rights reserved.
diff --git a/cli-runopts.c b/cli-runopts.c
index 13d6b45a..e7b1ed91 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -49,7 +49,11 @@ static void add_netcat(const char *str);
static void printhelp() {
fprintf(stderr, "Dropbear client v%s\n"
+#ifdef ENABLE_CLI_MULTIHOP
+ "Usage: %s [options] [user@]host[/port][,[user@]host/port],...] [command]\n"
+#else
"Usage: %s [options] [user@]host[/port] [command]\n"
+#endif
"Options are:\n"
"-p <remoteport>\n"
"-l <username>\n"
@@ -72,13 +76,13 @@ static void printhelp() {
"-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
"-K <keepalive> (0 is never, default %d)\n"
#ifdef ENABLE_CLI_NETCAT
- "-B <endhost:endport> Netcat-alike bouncing\n"
+ "-B <endhost:endport> Netcat-alike forwarding\n"
#endif
#ifdef ENABLE_CLI_PROXYCMD
- "-J <proxy_program> Use program rather than tcp connection\n"
+ "-J <proxy_program> Use program pipe rather than TCP connection\n"
#endif
#ifdef DEBUG_TRACE
- "-v verbose\n"
+ "-v verbose (compiled with DEBUG_TRACE)\n"
#endif
,DROPBEAR_VERSION, cli_opts.progname,
DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE);
diff --git a/dbclient.1 b/dbclient.1
index 934e34ac..be841c56 100644
--- a/dbclient.1
+++ b/dbclient.1
@@ -11,6 +11,12 @@ dbclient \- lightweight SSH2 client
.IR user ]
.I host
.RI [ command ]
+
+.B dbclient
+[
+.I args ]
+.I [user1]@host1[/port1],[user2]@host2[/port2],...
+
.SH DESCRIPTION
.B dbclient
is a SSH 2 client designed to be small enough to be used in small memory
@@ -87,22 +93,40 @@ useful for working around firewalls or routers that drop connections after
a certain period of inactivity. The trade-off is that a session may be
closed if there is a temporary lapse of network connectivity. A setting
if 0 disables keepalives.
+.B \-J \fIproxy_command
+Use the standard input/output of the program \fIproxy_command\fR rather than using
+a normal TCP connection. A hostname should be still be provided, as this is used for
+comparing saved hostkeys.
+.B \B \fIendhost:endport
+"Netcat-alike" mode, where Dropbear will connect to the given host, then create a
+forwarded connection to \fIendhost\fR. This will then be presented as dbclient's
+standard input/output.
+
+Dropbear will also allow multiple "hops" to be specified, separated by commas. In
+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.
+This syntax can also be used with scp or rsync (specifying dbclient as the
+ssh/rsh command). A port for a host can be specified with a slash (eg matt@martello/44 ).
+
.SH ENVIRONMENT
.TP
+.B DROPBEAR_PASSWORD
+A password to use for remote authentication can be specified in the environment
+variable DROPBEAR_PASSWORD. Care should be taken that the password is not
+exposed to other users on a multi-user system, or stored in accessible files.
+.TP
.B SSH_ASKPASS
dbclient can use an external program to request a password from a user.
SSH_ASKPASS should be set to the path of a program that will return a password
on standard output. This program will only be used if either DISPLAY is set and
standard input is not a TTY, or the environment variable SSH_ASKPASS_ALWAYS is
set.
-.TP
-.B DROPBEAR_PASSWORD
-A password to use for remote authentication can be specified in the environment
-variable DROPBEAR_PASSWORD. Care should be taken that the password is not
-exposed to other users on a multi-user system, or stored in accessible files.
.SH AUTHOR
Matt Johnston (matt@ucc.asn.au).
.br
+Mihnea Stoenescu wrote initial Dropbear client support
+.br
Gerrit Pape (pape@smarden.org) wrote this manual page.
.SH SEE ALSO
dropbear(8), dropbearkey(8)
--
GitLab