diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-04-06 05:51:27 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-04-06 06:20:33 +0200 |
| commit | 30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e (patch) | |
| tree | bea710bc8bb17f64594cfded757a6bfc405cc50a | |
| parent | upstream: ssh does not accept -oInclude=... on the commandline, the (diff) | |
| download | openssh-30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e.tar.xz openssh-30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e.zip | |
upstream: add a couple of missed options to the config dump; patch
from Jakub Jelen via bz2835
OpenBSD-Commit-ID: 5970adadf6ef206bee0dddfc75d24c2019861446
| -rw-r--r-- | readconf.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index f69b46547..ae1c31da0 100644 --- a/readconf.c +++ b/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.284 2018/04/04 15:12:17 job Exp $ */ +/* $OpenBSD: readconf.c,v 1.285 2018/04/06 03:51:27 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2348,6 +2348,8 @@ fmt_intarg(OpCodes code, int val) return fmt_multistate_int(val, multistate_requesttty); case oCanonicalizeHostname: return fmt_multistate_int(val, multistate_canonicalizehostname); + case oAddKeysToAgent: + return fmt_multistate_int(val, multistate_yesnoaskconfirm); case oFingerprintHash: return ssh_digest_alg_name(val); default: @@ -2467,6 +2469,7 @@ dump_client_config(Options *o, const char *host) dump_cfg_int(oPort, o->port); /* Flag options */ + dump_cfg_fmtint(oAddKeysToAgent, o->add_keys_to_agent); dump_cfg_fmtint(oAddressFamily, o->address_family); dump_cfg_fmtint(oBatchMode, o->batch_mode); dump_cfg_fmtint(oCanonicalizeFallbackLocal, o->canonicalize_fallback_local); @@ -2523,6 +2526,7 @@ dump_client_config(Options *o, const char *host) dump_cfg_string(oHostKeyAlias, o->host_key_alias); dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types); dump_cfg_string(oIdentityAgent, o->identity_agent); + dump_cfg_string(oIgnoreUnknown, o->ignored_unknown); dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices); dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX); dump_cfg_string(oLocalCommand, o->local_command); @@ -2545,6 +2549,7 @@ dump_client_config(Options *o, const char *host) /* String array options */ dump_cfg_strarray(oIdentityFile, o->num_identity_files, o->identity_files); dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains); + dump_cfg_strarray(oCertificateFile, o->num_certificate_files, o->certificate_files); dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles); dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles); dump_cfg_strarray(oSendEnv, o->num_send_env, o->send_env); @@ -2605,6 +2610,9 @@ dump_client_config(Options *o, const char *host) printf("streamlocalbindmask 0%o\n", o->fwd_opts.streamlocal_bind_mask); + /* oLogFacility */ + printf("syslogfacility %s\n", log_facility_name(o->log_facility)); + /* oProxyCommand / oProxyJump */ if (o->jump_host == NULL) dump_cfg_string(oProxyCommand, o->proxy_command); |