summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:59:25 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:59:25 +0000
commitbcc1808bf26c36a393e0caf852d921cec59802c4 (patch)
tree6347039a50b7818182e0c768940b616081d2271e /ssh.c
parentffce1476383e513c252452d444d17af59c14ef2c (diff)
- jakob@cvs.openbsd.org 2001/08/02 16:14:05
[scard.c ssh-agent.c ssh.c ssh-keygen.c] clean up some /* SMARTCARD */. ok markus@
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh.c b/ssh.c
index ee3f0c6a0..e2d2c16bd 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.136 2001/08/02 15:43:57 jakob Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.137 2001/08/02 16:14:05 jakob Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -72,7 +72,7 @@ RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 jakob Exp $");
72#ifdef SMARTCARD 72#ifdef SMARTCARD
73#include <openssl/engine.h> 73#include <openssl/engine.h>
74#include "scard.h" 74#include "scard.h"
75#endif /* SMARTCARD */ 75#endif
76 76
77#ifdef HAVE___PROGNAME 77#ifdef HAVE___PROGNAME
78extern char *__progname; 78extern char *__progname;
@@ -171,7 +171,7 @@ usage(void)
171 "(default: ~/.ssh/identity)\n"); 171 "(default: ~/.ssh/identity)\n");
172#ifdef SMARTCARD 172#ifdef SMARTCARD
173 fprintf(stderr, " -I reader Set smartcard reader.\n"); 173 fprintf(stderr, " -I reader Set smartcard reader.\n");
174#endif /* SMARTCARD */ 174#endif
175 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");
176 fprintf(stderr, " -T Do not allocate a tty.\n"); 176 fprintf(stderr, " -T Do not allocate a tty.\n");
177 fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); 177 fprintf(stderr, " -v Verbose; display verbose debugging messages.\n");
@@ -376,9 +376,9 @@ again:
376 case 'I': 376 case 'I':
377#ifdef SMARTCARD 377#ifdef SMARTCARD
378 options.smartcard_device = xstrdup(optarg); 378 options.smartcard_device = xstrdup(optarg);
379#else /* SMARTCARD */ 379#else
380 fprintf(stderr, "no support for smartcards.\n"); 380 fprintf(stderr, "no support for smartcards.\n");
381#endif /* SMARTCARD */ 381#endif
382 break; 382 break;
383 case 't': 383 case 't':
384 if (tty_flag) 384 if (tty_flag)