diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh.c | 9 |
2 files changed, 12 insertions, 5 deletions
@@ -3,6 +3,12 @@ | |||
3 | - jmc@cvs.openbsd.org 2004/11/07 17:42:36 | 3 | - jmc@cvs.openbsd.org 2004/11/07 17:42:36 |
4 | [ssh.1] | 4 | [ssh.1] |
5 | options sort, and whitespace; | 5 | options sort, and whitespace; |
6 | - jmc@cvs.openbsd.org 2004/11/07 17:57:30 | ||
7 | [ssh.c] | ||
8 | usage(): | ||
9 | - add -O | ||
10 | - sync -S w/ manpage | ||
11 | - remove -h | ||
6 | 12 | ||
7 | 20041107 | 13 | 20041107 |
8 | - (dtucker) OpenBSD CVS Sync | 14 | - (dtucker) OpenBSD CVS Sync |
@@ -1860,4 +1866,4 @@ | |||
1860 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1866 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1861 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1867 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1862 | 1868 | ||
1863 | $Id: ChangeLog,v 1.3582 2004/12/03 03:08:45 dtucker Exp $ | 1869 | $Id: ChangeLog,v 1.3583 2004/12/03 03:10:19 dtucker Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.229 2004/11/07 00:01:46 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.230 2004/11/07 17:57:30 jmc Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -157,10 +157,11 @@ static void | |||
157 | usage(void) | 157 | usage(void) |
158 | { | 158 | { |
159 | fprintf(stderr, | 159 | fprintf(stderr, |
160 | "usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" | 160 | "usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" |
161 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" | 161 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" |
162 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" | 162 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-O ctl_cmd]\n" |
163 | " [-p port] [-R port:host:hostport] [-S ctl] [user@]hostname [command]\n" | 163 | " [-o option] [-p port] [-R port:host:hostport] [-S ctl_path]\n" |
164 | " [user@]hostname [command]\n" | ||
164 | ); | 165 | ); |
165 | exit(1); | 166 | exit(1); |
166 | } | 167 | } |