View | Details | Raw Unified | Return to bug 3126 | Differences between
and this patch

Collapse All | Expand All

(-)a/servconf.c (+6 lines)
Lines 698-704 static struct { Link Here
698
	{ "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
698
	{ "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
699
	{ "disableforwarding", sDisableForwarding, SSHCFG_ALL },
699
	{ "disableforwarding", sDisableForwarding, SSHCFG_ALL },
700
	{ "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
700
	{ "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
701
#if defined(__OpenBSD__)
701
	{ "rdomain", sRDomain, SSHCFG_ALL },
702
	{ "rdomain", sRDomain, SSHCFG_ALL },
703
#else
704
	{ "rdomain", sUnsupported, SSHCFG_ALL },
705
#endif
702
	{ "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
706
	{ "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
703
	{ "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
707
	{ "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
704
	{ NULL, sBadOption, 0 }
708
	{ NULL, sBadOption, 0 }
Lines 2841-2847 dump_config(ServerOptions *o) Link Here
2841
	dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);
2845
	dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);
2842
	dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);
2846
	dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);
2843
	dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types);
2847
	dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types);
2848
#if defined(__OpenBSD__)
2844
	dump_cfg_string(sRDomain, o->routing_domain);
2849
	dump_cfg_string(sRDomain, o->routing_domain);
2850
#endif
2845
2851
2846
	/* string arguments requiring a lookup */
2852
	/* string arguments requiring a lookup */
2847
	dump_cfg_string(sLogLevel, log_level_name(o->log_level));
2853
	dump_cfg_string(sLogLevel, log_level_name(o->log_level));
(-)a/sshd_config.5 (+1 lines)
Lines 1542-1547 will be bound to this Link Here
1542
If the routing domain is set to
1542
If the routing domain is set to
1543
.Cm \&%D ,
1543
.Cm \&%D ,
1544
then the domain in which the incoming connection was received will be applied.
1544
then the domain in which the incoming connection was received will be applied.
1545
This feature is available on OpenBSD only.
1545
.It Cm SecurityKeyProvider
1546
.It Cm SecurityKeyProvider
1546
Specifies a path to a library that will be used when loading
1547
Specifies a path to a library that will be used when loading
1547
FIDO authenticator-hosted keys, overriding the default of using
1548
FIDO authenticator-hosted keys, overriding the default of using

Return to bug 3126