diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:35:51 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:35:51 +0000 |
commit | f7db3bb64caf8d7822a18d6fd4c0480df7d0086d (patch) | |
tree | 3167ed1f115185df591dc1c28c8aa33476194cbb /ssh.c | |
parent | 3ab1dfa2a654b6764eaa121f7111e94c35175894 (diff) |
- markus@cvs.openbsd.org 2001/08/01 22:03:33
[authfd.c authfd.h readconf.c readconf.h scard.c scard.h ssh-add.c
ssh-agent.c ssh.c]
use strings instead of ints for smartcard reader ids
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.132 2001/07/31 09:28:44 jakob Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.133 2001/08/01 22:03:33 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -372,7 +372,7 @@ again: | |||
372 | break; | 372 | break; |
373 | case 'I': | 373 | case 'I': |
374 | #ifdef SMARTCARD | 374 | #ifdef SMARTCARD |
375 | options.smartcard_device = atoi(optarg); | 375 | options.smartcard_device = xstrdup(optarg); |
376 | #else | 376 | #else |
377 | fprintf(stderr, "no support for smartcards.\n"); | 377 | fprintf(stderr, "no support for smartcards.\n"); |
378 | #endif | 378 | #endif |
@@ -1151,7 +1151,7 @@ load_public_identity_files(void) | |||
1151 | int i = 0; | 1151 | int i = 0; |
1152 | 1152 | ||
1153 | #ifdef SMARTCARD | 1153 | #ifdef SMARTCARD |
1154 | if (options.smartcard_device >= 0 && | 1154 | if (options.smartcard_device != NULL && |
1155 | options.num_identity_files + 1 < SSH_MAX_IDENTITY_FILES && | 1155 | options.num_identity_files + 1 < SSH_MAX_IDENTITY_FILES && |
1156 | (public = sc_get_key(options.smartcard_device)) != NULL ) { | 1156 | (public = sc_get_key(options.smartcard_device)) != NULL ) { |
1157 | Key *new; | 1157 | Key *new; |