diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:53:42 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:53:42 +0000 |
commit | 61eb9568b32a0c0d57808f9b7d12231d99220636 (patch) | |
tree | b084126ed09a3c7802cb0149356fe02cc0a0d627 | |
parent | a1ec4a9cb8b2f291780f7a66be967e8e22fc4bde (diff) |
- jakob@cvs.openbsd.org 2001/08/02 15:32:10
[ssh.c]
add smartcard to usage(). ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -116,6 +116,9 @@ | |||
116 | - jakob@cvs.openbsd.org 2001/08/02 15:07:23 | 116 | - jakob@cvs.openbsd.org 2001/08/02 15:07:23 |
117 | [ssh-keygen.1] | 117 | [ssh-keygen.1] |
118 | document smartcard upload/download. ok markus@ | 118 | document smartcard upload/download. ok markus@ |
119 | - jakob@cvs.openbsd.org 2001/08/02 15:32:10 | ||
120 | [ssh.c] | ||
121 | add smartcard to usage(). ok markus@ | ||
119 | 122 | ||
120 | 20010803 | 123 | 20010803 |
121 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 124 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6226,4 +6229,4 @@ | |||
6226 | - Wrote replacements for strlcpy and mkdtemp | 6229 | - Wrote replacements for strlcpy and mkdtemp |
6227 | - Released 1.0pre1 | 6230 | - Released 1.0pre1 |
6228 | 6231 | ||
6229 | $Id: ChangeLog,v 1.1456 2001/08/06 21:51:34 mouring Exp $ | 6232 | $Id: ChangeLog,v 1.1457 2001/08/06 21:53:42 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.134 2001/08/01 23:38:45 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.135 2001/08/02 15:32:10 jakob Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -169,6 +169,9 @@ usage(void) | |||
169 | fprintf(stderr, " -x Disable X11 connection forwarding (default).\n"); | 169 | fprintf(stderr, " -x Disable X11 connection forwarding (default).\n"); |
170 | fprintf(stderr, " -i file Identity for public key authentication " | 170 | fprintf(stderr, " -i file Identity for public key authentication " |
171 | "(default: ~/.ssh/identity)\n"); | 171 | "(default: ~/.ssh/identity)\n"); |
172 | #ifdef SMARTCARD | ||
173 | fprintf(stderr, " -I reader Set smartcard reader.\n"); | ||
174 | #endif /* SMARTCARD */ | ||
172 | fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); | 175 | fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); |
173 | fprintf(stderr, " -T Do not allocate a tty.\n"); | 176 | fprintf(stderr, " -T Do not allocate a tty.\n"); |
174 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); | 177 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); |