diff options
| author |   djm <djm@openbsd.org> | 2019-03-01 02:08:50 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-03-01 02:08:50 +0000 |
| commit | 174693a22b184fab51d03637afee06c863cad8d9 (patch) | |
| tree | c28446a785f4aba9a4d125a91e6b511f59ff4cec | |
| parent | Background init progress and consistency check progress are reported in (diff) | |
| download | wireguard-openbsd-174693a22b184fab51d03637afee06c863cad8d9.tar.xz wireguard-openbsd-174693a22b184fab51d03637afee06c863cad8d9.zip | |
let PKCS11Provider=none do what users expect
print PKCS11Provider instead of obsolete SmartcardDevice in config dump.
bz#2974 ok dtucker@
| -rw-r--r-- | usr.bin/ssh/readconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 560362048fe..5d7ee6c408f 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.303 2019/02/23 08:20:43 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.304 2019/03/01 02:08:50 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -193,8 +193,8 @@ static struct { { "gssapidelegatecredentials", oUnsupported }, #endif #ifdef ENABLE_PKCS11 - { "smartcarddevice", oPKCS11Provider }, { "pkcs11provider", oPKCS11Provider }, + { "smartcarddevice", oPKCS11Provider }, # else { "smartcarddevice", oUnsupported }, { "pkcs11provider", oUnsupported }, @@ -2130,6 +2130,7 @@ fill_default_options(Options * options) CLEAR_ON_NONE(options->proxy_command); CLEAR_ON_NONE(options->control_path); CLEAR_ON_NONE(options->revoked_host_keys); + CLEAR_ON_NONE(options->pkcs11_provider); if (options->jump_host != NULL && strcmp(options->jump_host, "none") == 0 && options->jump_port == 0 && options->jump_user == NULL) { |