diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -24,6 +24,9 @@ | |||
24 | - jmc@cvs.openbsd.org 2005/09/19 15:38:27 | 24 | - jmc@cvs.openbsd.org 2005/09/19 15:38:27 |
25 | [ssh.1] | 25 | [ssh.1] |
26 | some more .Bk/.Ek to avoid ugly line split; | 26 | some more .Bk/.Ek to avoid ugly line split; |
27 | - jmc@cvs.openbsd.org 2005/09/19 15:42:44 | ||
28 | [ssh.c] | ||
29 | update -D usage here too; | ||
27 | 30 | ||
28 | 20050930 | 31 | 20050930 |
29 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype | 32 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype |
@@ -3064,4 +3067,4 @@ | |||
3064 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3067 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3065 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3068 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3066 | 3069 | ||
3067 | $Id: ChangeLog,v 1.3908 2005/10/03 08:17:38 dtucker Exp $ | 3070 | $Id: ChangeLog,v 1.3909 2005/10/03 08:18:05 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.250 2005/09/13 23:40:07 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.251 2005/09/19 15:42:44 jmc Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -158,7 +158,7 @@ usage(void) | |||
158 | { | 158 | { |
159 | fprintf(stderr, | 159 | fprintf(stderr, |
160 | "usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-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]\n" | 161 | " [-D [bind_address:]port] [-e escape_char] [-F configfile]\n" |
162 | " [-i identity_file] [-L [bind_address:]port:host:hostport]\n" | 162 | " [-i identity_file] [-L [bind_address:]port:host:hostport]\n" |
163 | " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" | 163 | " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" |
164 | " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" | 164 | " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" |