upstream commit

include PubkeyAcceptedKeyTypes in ssh -G config dump

Upstream-ID: 6c097ce6ffebf6fe393fb7988b5d152a5d6b36bb

diff --git a/readconf.c b/readconf.c
index 09888b14d313222abc9f724e7b375dfec24029e2..94bf7e1b4bdda3a2fb070bc5f739e24a971e5075 100644 (file)
--- 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);