kentpeacock / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
aedd00
commit 5481d0b4036b33b92c372ee36258ed11bff57d5d
aedd00
Author: Jakub Jelen <jjelen@redhat.com>
aedd00
Date:   Thu Feb 27 10:07:33 2020 +0100
aedd00
aedd00
    Mark the RDomain configuration option unsupported on non-openbsd builds
aedd00
aedd00
diff --git a/servconf.c b/servconf.c
aedd00
index db80e943..153d2525 100644
aedd00
--- a/servconf.c
aedd00
+++ b/servconf.c
aedd00
@@ -698,7 +698,11 @@ static struct {
aedd00
 	{ "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
aedd00
 	{ "disableforwarding", sDisableForwarding, SSHCFG_ALL },
aedd00
 	{ "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
aedd00
+#if defined(__OpenBSD__)
aedd00
 	{ "rdomain", sRDomain, SSHCFG_ALL },
aedd00
+#else
aedd00
+	{ "rdomain", sUnsupported, SSHCFG_ALL },
aedd00
+#endif
aedd00
 	{ "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
aedd00
 	{ NULL, sBadOption, 0 }
aedd00
 };
aedd00
@@ -2841,7 +2845,9 @@ dump_config(ServerOptions *o)
aedd00
 	    o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
aedd00
 	dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?
aedd00
 	    o->pubkey_key_types : KEX_DEFAULT_PK_ALG);
aedd00
+#if defined(__OpenBSD__)
aedd00
 	dump_cfg_string(sRDomain, o->routing_domain);
aedd00
+#endif
aedd00
 
aedd00
 	/* string arguments requiring a lookup */
aedd00
 	dump_cfg_string(sLogLevel, log_level_name(o->log_level));
aedd00
diff --git a/sshd_config.5 b/sshd_config.5
aedd00
index 5dca8981..766e9b90 100644
aedd00
--- a/sshd_config.5
aedd00
+++ b/sshd_config.5
aedd00
@@ -1542,6 +1542,7 @@ will be bound to this
aedd00
 If the routing domain is set to
aedd00
 .Cm \&%D ,
aedd00
 then the domain in which the incoming connection was received will be applied.
aedd00
+This feature is available on OpenBSD only.
aedd00
 .It Cm SetEnv
aedd00
 Specifies one or more environment variables to set in child sessions started
aedd00
 by