Attachment 3131 Details for Bug 2835 – readconf.c: Dump missing options

[patch] readconf.c: Dump missing options

openssh_dump.patch (text/plain), 2.29 KB, created by Jakub Jelen on 2018-02-27 06:47:47 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2018-02-27 06:47:47 AEDT

Size: 2.29 KB

patch

obsolete

>commit ba611a34f044a038aead1618c141cdf162c47d43
>Author: Jakub Jelen <jjelen@redhat.com>
>Date:   Mon Feb 26 20:25:30 2018 +0100
>
>    readconf.c: Dump missing options
>
>diff --git a/readconf.c b/readconf.c
>index 88051db5..2dace65e 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -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:
>@@ -2505,6 +2507,7 @@ dump_client_config(Options *o, const char *host)
> 	dump_cfg_fmtint(oVerifyHostKeyDNS, o->verify_host_key_dns);
> 	dump_cfg_fmtint(oVisualHostKey, o->visual_host_key);
> 	dump_cfg_fmtint(oUpdateHostkeys, o->update_hostkeys);
>+	dump_cfg_fmtint(oAddKeysToAgent, o->add_keys_to_agent);
> 
> 	/* Integer options */
> 	dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);
>@@ -2536,6 +2539,7 @@ dump_client_config(Options *o, const char *host)
> 	dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
> 	dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
> 	dump_cfg_string(oXAuthLocation, o->xauth_location);
>+	dump_cfg_string(oIgnoreUnknown, o->ignored_unknown);
> 
> 	/* Forwards */
> 	dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);
>@@ -2544,6 +2548,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(oCertificateFile, o->num_certificate_files, o->certificate_files);
> 	dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains);
> 	dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles);
> 	dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);
>@@ -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);

Actions: View | Diff

Attachments on bug 2835: 3131