View | Details | Raw Unified | Return to bug 2835
Collapse All | Expand All

(-)a/readconf.c (+8 lines)
Lines 2348-2353 fmt_intarg(OpCodes code, int val) Link Here
2348
		return fmt_multistate_int(val, multistate_requesttty);
2348
		return fmt_multistate_int(val, multistate_requesttty);
2349
	case oCanonicalizeHostname:
2349
	case oCanonicalizeHostname:
2350
		return fmt_multistate_int(val, multistate_canonicalizehostname);
2350
		return fmt_multistate_int(val, multistate_canonicalizehostname);
2351
	case oAddKeysToAgent:
2352
		return fmt_multistate_int(val, multistate_yesnoaskconfirm);
2351
	case oFingerprintHash:
2353
	case oFingerprintHash:
2352
		return ssh_digest_alg_name(val);
2354
		return ssh_digest_alg_name(val);
2353
	default:
2355
	default:
Lines 2505-2510 dump_client_config(Options *o, const char *host) Link Here
2505
	dump_cfg_fmtint(oVerifyHostKeyDNS, o->verify_host_key_dns);
2507
	dump_cfg_fmtint(oVerifyHostKeyDNS, o->verify_host_key_dns);
2506
	dump_cfg_fmtint(oVisualHostKey, o->visual_host_key);
2508
	dump_cfg_fmtint(oVisualHostKey, o->visual_host_key);
2507
	dump_cfg_fmtint(oUpdateHostkeys, o->update_hostkeys);
2509
	dump_cfg_fmtint(oUpdateHostkeys, o->update_hostkeys);
2510
	dump_cfg_fmtint(oAddKeysToAgent, o->add_keys_to_agent);
2508
2511
2509
	/* Integer options */
2512
	/* Integer options */
2510
	dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);
2513
	dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);
Lines 2536-2541 dump_client_config(Options *o, const char *host) Link Here
2536
	dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
2539
	dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
2537
	dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
2540
	dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
2538
	dump_cfg_string(oXAuthLocation, o->xauth_location);
2541
	dump_cfg_string(oXAuthLocation, o->xauth_location);
2542
	dump_cfg_string(oIgnoreUnknown, o->ignored_unknown);
2539
2543
2540
	/* Forwards */
2544
	/* Forwards */
2541
	dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);
2545
	dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);
Lines 2544-2549 dump_client_config(Options *o, const char *host) Link Here
2544
2548
2545
	/* String array options */
2549
	/* String array options */
2546
	dump_cfg_strarray(oIdentityFile, o->num_identity_files, o->identity_files);
2550
	dump_cfg_strarray(oIdentityFile, o->num_identity_files, o->identity_files);
2551
	dump_cfg_strarray(oCertificateFile, o->num_certificate_files, o->certificate_files);
2547
	dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains);
2552
	dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains);
2548
	dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles);
2553
	dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles);
2549
	dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);
2554
	dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);
Lines 2605-2610 dump_client_config(Options *o, const char *host) Link Here
2605
	printf("streamlocalbindmask 0%o\n",
2610
	printf("streamlocalbindmask 0%o\n",
2606
	    o->fwd_opts.streamlocal_bind_mask);
2611
	    o->fwd_opts.streamlocal_bind_mask);
2607
2612
2613
	/* oLogFacility */
2614
	printf("SyslogFacility %s\n", log_facility_name(o->log_facility));
2615
2608
	/* oProxyCommand / oProxyJump */
2616
	/* oProxyCommand / oProxyJump */
2609
	if (o->jump_host == NULL)
2617
	if (o->jump_host == NULL)
2610
		dump_cfg_string(oProxyCommand, o->proxy_command);
2618
		dump_cfg_string(oProxyCommand, o->proxy_command);

Return to bug 2835