diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-03-01 02:08:50 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-03-01 13:21:29 +1100 |
commit | 95a8058c1a90a27acbb91392ba206854abc85226 (patch) | |
tree | 7bcacf94127859af1e30227af0f82a9edd2dfe34 | |
parent | 8e7bac35aa576d2fd7560836da83733e864ce649 (diff) |
upstream: let PKCS11Provider=none do what users expect
print PKCS11Provider instead of obsolete SmartcardDevice in config dump.
bz#2974 ok dtucker@
OpenBSD-Commit-ID: c303d6f0230a33aa2dd92dc9b68843d56a64f846
-rw-r--r-- | readconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index a45667465..ec497e79f 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.303 2019/02/23 08:20:43 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.304 2019/03/01 02:08:50 djm 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 |
@@ -208,8 +208,8 @@ static struct { | |||
208 | { "gssapidelegatecredentials", oUnsupported }, | 208 | { "gssapidelegatecredentials", oUnsupported }, |
209 | #endif | 209 | #endif |
210 | #ifdef ENABLE_PKCS11 | 210 | #ifdef ENABLE_PKCS11 |
211 | { "smartcarddevice", oPKCS11Provider }, | ||
212 | { "pkcs11provider", oPKCS11Provider }, | 211 | { "pkcs11provider", oPKCS11Provider }, |
212 | { "smartcarddevice", oPKCS11Provider }, | ||
213 | # else | 213 | # else |
214 | { "smartcarddevice", oUnsupported }, | 214 | { "smartcarddevice", oUnsupported }, |
215 | { "pkcs11provider", oUnsupported }, | 215 | { "pkcs11provider", oUnsupported }, |
@@ -2147,6 +2147,7 @@ fill_default_options(Options * options) | |||
2147 | CLEAR_ON_NONE(options->proxy_command); | 2147 | CLEAR_ON_NONE(options->proxy_command); |
2148 | CLEAR_ON_NONE(options->control_path); | 2148 | CLEAR_ON_NONE(options->control_path); |
2149 | CLEAR_ON_NONE(options->revoked_host_keys); | 2149 | CLEAR_ON_NONE(options->revoked_host_keys); |
2150 | CLEAR_ON_NONE(options->pkcs11_provider); | ||
2150 | if (options->jump_host != NULL && | 2151 | if (options->jump_host != NULL && |
2151 | strcmp(options->jump_host, "none") == 0 && | 2152 | strcmp(options->jump_host, "none") == 0 && |
2152 | options->jump_port == 0 && options->jump_user == NULL) { | 2153 | options->jump_port == 0 && options->jump_user == NULL) { |