summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:57:31 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:57:31 +0000
commitffce1476383e513c252452d444d17af59c14ef2c (patch)
tree3db1f9722242be49dcd9c23ad706b31902d92f9e /ssh.c
parent61eb9568b32a0c0d57808f9b7d12231d99220636 (diff)
- jakob@cvs.openbsd.org 2001/08/02 15:43:57
[ssh-agent.c ssh.c ssh-keygen.c] add /* SMARTCARD */ to #else/#endif. 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 501a4a27b..ee3f0c6a0 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.135 2001/08/02 15:32:10 jakob Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 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.135 2001/08/02 15:32:10 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 75#endif /* SMARTCARD */
76 76
77#ifdef HAVE___PROGNAME 77#ifdef HAVE___PROGNAME
78extern char *__progname; 78extern char *__progname;
@@ -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 379#else /* SMARTCARD */
380 fprintf(stderr, "no support for smartcards.\n"); 380 fprintf(stderr, "no support for smartcards.\n");
381#endif 381#endif /* SMARTCARD */
382 break; 382 break;
383 case 't': 383 case 't':
384 if (tty_flag) 384 if (tty_flag)
@@ -1195,7 +1195,7 @@ load_public_identity_files(void)
1195 1195
1196 key_free(public); 1196 key_free(public);
1197 } 1197 }
1198#endif 1198#endif /* SMARTCARD */
1199 for (; i < options.num_identity_files; i++) { 1199 for (; i < options.num_identity_files; i++) {
1200 filename = tilde_expand_filename(options.identity_files[i], 1200 filename = tilde_expand_filename(options.identity_files[i],
1201 original_real_uid); 1201 original_real_uid);