47 lines
1.8 KiB
Plaintext
47 lines
1.8 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 2023-12-19 17:09:41.366788000 -0800
|
|
+++ readconf.c 2023-12-19 17:10:24.155247000 -0800
|
|
@@ -329,6 +329,12 @@
|
|
{ "enableescapecommandline", oEnableEscapeCommandline },
|
|
{ "obscurekeystroketiming", oObscureKeystrokeTiming },
|
|
{ "channeltimeout", oChannelTimeout },
|
|
+ { "hpndisabled", oDeprecated },
|
|
+ { "hpnbuffersize", oDeprecated },
|
|
+ { "tcprcvbufpoll", oDeprecated },
|
|
+ { "tcprcvbuf", oDeprecated },
|
|
+ { "noneenabled", oUnsupported },
|
|
+ { "noneswitch", oUnsupported },
|
|
|
|
{ NULL, oBadOption }
|
|
};
|
|
--- servconf.c.orig 2023-12-19 17:11:52.320491000 -0800
|
|
+++ servconf.c 2023-12-19 17:12:43.950318000 -0800
|
|
@@ -693,6 +693,10 @@
|
|
{ "requiredrsasize", sRequiredRSASize, SSHCFG_ALL },
|
|
{ "channeltimeout", sChannelTimeout, SSHCFG_ALL },
|
|
{ "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL },
|
|
+ { "noneenabled", sUnsupported, SSHCFG_ALL },
|
|
+ { "hpndisabled", sDeprecated, SSHCFG_ALL },
|
|
+ { "hpnbuffersize", sDeprecated, SSHCFG_ALL },
|
|
+ { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL },
|
|
{ NULL, sBadOption, 0 }
|
|
};
|
|
|