- djm@cvs.openbsd.org 2004/06/17 23:56:57
[ssh.1 ssh.c]
sync usage() and SYNPOSIS with connection sharing changes
diff --git a/ChangeLog b/ChangeLog
index 96701bf..2a24d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
shared connection env passing regress test
- (dtucker) [regress/README.regress] Add detail on how to run a single
test from the top-level Makefile.
+ - (dtucker) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2004/06/17 23:56:57
+ [ssh.1 ssh.c]
+ sync usage() and SYNPOSIS with connection sharing changes
20040617
- (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1285,4 +1289,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3408 2004/06/18 04:14:43 dtucker Exp $
+$Id: ChangeLog,v 1.3409 2004/06/18 06:22:39 dtucker Exp $
diff --git a/ssh.1 b/ssh.1
index b70102b..dcd02c2 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.190 2004/06/13 15:03:02 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.191 2004/06/17 23:56:57 djm Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -43,7 +43,7 @@
.Nd OpenSSH SSH client (remote login program)
.Sh SYNOPSIS
.Nm ssh
-.Op Fl 1246AaCfgkMNnqSsTtVvXxY
+.Op Fl 1246AaCfgkMNnqsTtVvXxY
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
.Op Fl D Ar port
@@ -74,6 +74,7 @@
.Sm on
.Xc
.Oc
+.Op Fl S Ar ctl_path
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Sh DESCRIPTION
@@ -737,11 +738,11 @@
.Ar hostport .
.Xc
.Sm on
-.It Fl S
-Places the
-.Nm
-client into slave mode for connection sharing.
+.It Fl S Ar ctl_path
+Specifies the location of a control socket for for connection sharing.
Refer to the description of
+.Cm ControlPath
+and
.Cm ControlMaster
in
.Xr ssh_config 5
diff --git a/ssh.c b/ssh.c
index 6f8114d..16284f8 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.216 2004/06/17 15:10:14 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.217 2004/06/17 23:56:57 djm Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -157,10 +157,11 @@
usage(void)
{
fprintf(stderr,
-"usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+"usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
" [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n"
" [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n"
-" [-p port] [-R port:host:hostport] [user@]hostname [command]\n"
+" [-p port] [-R port:host:hostport] [-S ctl_path]\n"
+" [user@]hostname [command]\n"
);
exit(1);
}