summaryrefslogtreecommitdiffstats
path: root/readconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-10-07 17:59:12 +0200
committerDamien Miller <djm@mindrot.org>2015-10-07 19:01:05 +0200
commit0c46bbe68b70bdf0d6d20588e5847e71f3739fe6 (patch)
treeac745ed6e68bc3b5431f4006bb3b2deaa39e05e1 /readconf.c
parentupstream commit (diff)
downloadopenssh-0c46bbe68b70bdf0d6d20588e5847e71f3739fe6.tar.xz
openssh-0c46bbe68b70bdf0d6d20588e5847e71f3739fe6.zip
upstream commit
include PubkeyAcceptedKeyTypes in ssh -G config dump Upstream-ID: 6c097ce6ffebf6fe393fb7988b5d152a5d6b36bb
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index 09888b14d..94bf7e1b4 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.241 2015/09/24 06:15:11 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.242 2015/10/07 15:59:12 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2363,6 +2363,7 @@ dump_client_config(Options *o, const char *host)
dump_cfg_string(oPKCS11Provider, o->pkcs11_provider);
dump_cfg_string(oPreferredAuthentications, o->preferred_authentications);
dump_cfg_string(oProxyCommand, o->proxy_command);
+ dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
dump_cfg_string(oXAuthLocation, o->xauth_location);