summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 150be56d7..da43230e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - deraadt@cvs.openbsd.org 2001/02/21 09:12:56 13 - deraadt@cvs.openbsd.org 2001/02/21 09:12:56
14 [sftp-server.c] 14 [sftp-server.c]
15 careful with & and &&; markus ok 15 careful with & and &&; markus ok
16 - stevesk@cvs.openbsd.org 2001/02/21 21:14:04
17 [ssh.c]
18 -i supports DSA identities now; ok markus@
16 19
1720010304 2020010304
18 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 21 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4205,4 +4208,4 @@
4205 - Wrote replacements for strlcpy and mkdtemp 4208 - Wrote replacements for strlcpy and mkdtemp
4206 - Released 1.0pre1 4209 - Released 1.0pre1
4207 4210
4208$Id: ChangeLog,v 1.855 2001/03/05 05:02:08 mouring Exp $ 4211$Id: ChangeLog,v 1.856 2001/03/05 05:04:57 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 9e5ca116f..7db19f3ba 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: ssh.c,v 1.96 2001/02/17 23:28:58 deraadt Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.97 2001/02/21 21:14:04 stevesk Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -161,7 +161,8 @@ usage(void)
161#endif /* AFS */ 161#endif /* AFS */
162 fprintf(stderr, " -X Enable X11 connection forwarding.\n"); 162 fprintf(stderr, " -X Enable X11 connection forwarding.\n");
163 fprintf(stderr, " -x Disable X11 connection forwarding.\n"); 163 fprintf(stderr, " -x Disable X11 connection forwarding.\n");
164 fprintf(stderr, " -i file Identity for RSA authentication (default: ~/.ssh/identity).\n"); 164 fprintf(stderr, " -i file Identity for public key authentication\n");
165 fprintf(stderr, " (default: ~/.ssh/identity).\n");
165 fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); 166 fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n");
166 fprintf(stderr, " -T Do not allocate a tty.\n"); 167 fprintf(stderr, " -T Do not allocate a tty.\n");
167 fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); 168 fprintf(stderr, " -v Verbose; display verbose debugging messages.\n");