47 lines
1.7 KiB
Plaintext
47 lines
1.7 KiB
Plaintext
------------------------------------------------------------------------
|
|
r294563 | des | 2016-01-22 05:13:46 -0800 (Fri, 22 Jan 2016) | 3 lines
|
|
Changed paths:
|
|
M /head/crypto/openssh/servconf.c
|
|
|
|
Instead of removing the NoneEnabled option, mark it as unsupported.
|
|
(should have done this in r291198, but didn't think of it until now)
|
|
|
|
------------------------------------------------------------------------
|
|
------------------------------------------------------------------------
|
|
r294564 | des | 2016-01-22 06:22:11 -0800 (Fri, 22 Jan 2016) | 2 lines
|
|
Changed paths:
|
|
M /head/crypto/openssh/readconf.c
|
|
|
|
r294563 was incomplete; re-add the client-side options as well.
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
--- readconf.c.orig 2021-04-27 11:24:15.916596000 -0700
|
|
+++ readconf.c 2021-04-27 11:25:24.222034000 -0700
|
|
@@ -316,6 +316,12 @@ static struct {
|
|
{ "proxyjump", oProxyJump },
|
|
{ "securitykeyprovider", oSecurityKeyProvider },
|
|
{ "knownhostscommand", oKnownHostsCommand },
|
|
+ { "hpndisabled", oDeprecated },
|
|
+ { "hpnbuffersize", oDeprecated },
|
|
+ { "tcprcvbufpoll", oDeprecated },
|
|
+ { "tcprcvbuf", oDeprecated },
|
|
+ { "noneenabled", oUnsupported },
|
|
+ { "noneswitch", oUnsupported },
|
|
|
|
{ NULL, oBadOption }
|
|
};
|
|
--- servconf.c.orig 2020-02-13 16:40:54.000000000 -0800
|
|
+++ servconf.c 2020-03-21 17:01:18.011062000 -0700
|
|
@@ -695,6 +695,10 @@ static struct {
|
|
{ "rdomain", sRDomain, SSHCFG_ALL },
|
|
{ "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
|
|
{ "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
|
|
+ { "noneenabled", sUnsupported, SSHCFG_ALL },
|
|
+ { "hpndisabled", sDeprecated, SSHCFG_ALL },
|
|
+ { "hpnbuffersize", sDeprecated, SSHCFG_ALL },
|
|
+ { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL },
|
|
{ NULL, sBadOption, 0 }
|
|
};
|
|
|