From 02faeceb5632393de553ef2b4b7d31d6f7b022c4 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Mar 2005 12:04:32 +1100 Subject: - jmc@cvs.openbsd.org 2005/03/01 17:22:06 [ssh.c] sync usage() w/ man SYNOPSIS; ok markus@ --- ChangeLog | 6 +++++- ssh.c | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 538e2e3b3..e306a8324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,10 @@ [scp.1 sftp.1] add HashKnownHosts to -o list; ok markus@ + - jmc@cvs.openbsd.org 2005/03/01 17:22:06 + [ssh.c] + sync usage() w/ man SYNOPSIS; + ok markus@ 20050301 - (djm) OpenBSD CVS sync: @@ -2241,4 +2245,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.3681 2005/03/02 01:04:16 djm Exp $ +$Id: ChangeLog,v 1.3682 2005/03/02 01:04:32 djm Exp $ diff --git a/ssh.c b/ssh.c index 99b25afcc..9acec3082 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.232 2005/03/01 10:09:52 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.233 2005/03/01 17:22:06 jmc Exp $"); #include #include @@ -158,10 +158,10 @@ usage(void) { fprintf(stderr, "usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" -" [-D [listen-host:]port] [-e escape_char] [-F configfile]\n" -" [-i identity_file] [-L [listen-host:]port:host:hostport]\n" +" [-D port] [-e escape_char] [-F configfile]\n" +" [-i identity_file] [-L [bind_address:]port:host:hostport]\n" " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" -" [-R [listen-host:]port:host:hostport] [-S ctl_path]\n" +" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" " [user@]hostname [command]\n" ); exit(1); -- cgit v1.2.3