diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2004-06-17 23:56:58 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2004-06-17 23:56:58 +0000 |
commit | af318007fe7ee1d3251352fdc01ccd444399b572 (patch) | |
tree | 9da1bdf4f42ce81db12fc34215e629387b3c4415 /usr.bin | |
parent | 9214f73daad94b13453dbdfbed05888adbea5aa8 (diff) |
sync usage() and SYNPOSIS with connection sharing changes
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/ssh/ssh.1 | 13 | ||||
-rw-r--r-- | usr.bin/ssh/ssh.c | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index b70102be58a..dcd02c28f40 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/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 @@ IPv6 addresses can be specified with an alternative syntax: .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/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index f34818916ce..28fb4ca60b4 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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> @@ -153,10 +153,11 @@ static void 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); } |