diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/readconf.c b/readconf.c index d424c1697..8bdc8caf1 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.182 2010/01/09 23:04:13 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.183 2010/02/08 10:50:20 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -123,7 +123,7 @@ typedef enum { | |||
123 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 123 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
124 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, | 124 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
125 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, | 125 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, |
126 | oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, | 126 | oHostKeyAlgorithms, oBindAddress, oPKCS11Provider, |
127 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | 127 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
128 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 128 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
129 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, | 129 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, |
@@ -205,10 +205,12 @@ static struct { | |||
205 | { "preferredauthentications", oPreferredAuthentications }, | 205 | { "preferredauthentications", oPreferredAuthentications }, |
206 | { "hostkeyalgorithms", oHostKeyAlgorithms }, | 206 | { "hostkeyalgorithms", oHostKeyAlgorithms }, |
207 | { "bindaddress", oBindAddress }, | 207 | { "bindaddress", oBindAddress }, |
208 | #ifdef SMARTCARD | 208 | #ifdef ENABLE_PKCS11 |
209 | { "smartcarddevice", oSmartcardDevice }, | 209 | { "smartcarddevice", oPKCS11Provider }, |
210 | { "pkcs11provider", oPKCS11Provider }, | ||
210 | #else | 211 | #else |
211 | { "smartcarddevice", oUnsupported }, | 212 | { "smartcarddevice", oUnsupported }, |
213 | { "pkcs11provider", oUnsupported }, | ||
212 | #endif | 214 | #endif |
213 | { "clearallforwardings", oClearAllForwardings }, | 215 | { "clearallforwardings", oClearAllForwardings }, |
214 | { "enablesshkeysign", oEnableSSHKeysign }, | 216 | { "enablesshkeysign", oEnableSSHKeysign }, |
@@ -609,8 +611,8 @@ parse_string: | |||
609 | charptr = &options->bind_address; | 611 | charptr = &options->bind_address; |
610 | goto parse_string; | 612 | goto parse_string; |
611 | 613 | ||
612 | case oSmartcardDevice: | 614 | case oPKCS11Provider: |
613 | charptr = &options->smartcard_device; | 615 | charptr = &options->pkcs11_provider; |
614 | goto parse_string; | 616 | goto parse_string; |
615 | 617 | ||
616 | case oProxyCommand: | 618 | case oProxyCommand: |
@@ -1051,7 +1053,7 @@ initialize_options(Options * options) | |||
1051 | options->log_level = SYSLOG_LEVEL_NOT_SET; | 1053 | options->log_level = SYSLOG_LEVEL_NOT_SET; |
1052 | options->preferred_authentications = NULL; | 1054 | options->preferred_authentications = NULL; |
1053 | options->bind_address = NULL; | 1055 | options->bind_address = NULL; |
1054 | options->smartcard_device = NULL; | 1056 | options->pkcs11_provider = NULL; |
1055 | options->enable_ssh_keysign = - 1; | 1057 | options->enable_ssh_keysign = - 1; |
1056 | options->no_host_authentication_for_localhost = - 1; | 1058 | options->no_host_authentication_for_localhost = - 1; |
1057 | options->identities_only = - 1; | 1059 | options->identities_only = - 1; |