From 9c6bf325c0cf03fc40e87e51d165189dce07c594 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 3 Dec 2004 14:10:19 +1100 Subject: [PATCH] - jmc@cvs.openbsd.org 2004/11/07 17:57:30 [ssh.c] usage(): - add -O - sync -S w/ manpage - remove -h --- ChangeLog | 8 +++++++- ssh.c | 9 +++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b3024429..35a7d07ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ - jmc@cvs.openbsd.org 2004/11/07 17:42:36 [ssh.1] options sort, and whitespace; + - jmc@cvs.openbsd.org 2004/11/07 17:57:30 + [ssh.c] + usage(): + - add -O + - sync -S w/ manpage + - remove -h 20041107 - (dtucker) OpenBSD CVS Sync @@ -1860,4 +1866,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.3582 2004/12/03 03:08:45 dtucker Exp $ +$Id: ChangeLog,v 1.3583 2004/12/03 03:10:19 dtucker Exp $ diff --git a/ssh.c b/ssh.c index dfe9b25c1..ac537338c 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.229 2004/11/07 00:01:46 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.230 2004/11/07 17:57:30 jmc Exp $"); #include #include @@ -157,10 +157,11 @@ static void usage(void) { fprintf(stderr, -"usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" +"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-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] [-S ctl] [user@]hostname [command]\n" +" [-L port:host:hostport] [-l login_name] [-m mac_spec] [-O ctl_cmd]\n" +" [-o option] [-p port] [-R port:host:hostport] [-S ctl_path]\n" +" [user@]hostname [command]\n" ); exit(1); }