diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 05:04:57 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 05:04:57 +0000 |
commit | 87af95b3e7a7e7aa3a0f5ef6135b20d28e3a0529 (patch) | |
tree | 3de8cb47a97db8a4be80ab72201f4f1198197919 | |
parent | 36592518dd0bd975de1534b0cdaee55597dcb3c8 (diff) |
- stevesk@cvs.openbsd.org 2001/02/21 21:14:04
[ssh.c]
-i supports DSA identities now; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -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 | ||
17 | 20010304 | 20 | 20010304 |
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 $ |
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.96 2001/02/17 23:28:58 deraadt Exp $"); | 42 | RCSID("$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"); |