diff options
author | des <des@FreeBSD.org> | 2016-01-19 18:38:17 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-01-19 18:38:17 +0000 |
commit | 76107b08804f309434efce7480edc2bbd15e1bf7 (patch) | |
tree | 273a34875c95ed74ac7d0650a7a261c797939bc2 | |
parent | 9e242a014282cb7888de83d25044d53f393a3ca1 (diff) | |
download | FreeBSD-src-76107b08804f309434efce7480edc2bbd15e1bf7.zip FreeBSD-src-76107b08804f309434efce7480edc2bbd15e1bf7.tar.gz |
Re-add HPN configuration options as deprecated options to avoid breaking
existing configurations that use them. Note that there is no functional
difference between OpenSSH with HPN and OpenSSH without HPN.
-rw-r--r-- | crypto/openssh/readconf.c | 4 | ||||
-rw-r--r-- | crypto/openssh/servconf.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 9a14c69..7c060c6 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -280,6 +280,10 @@ static struct { { "updatehostkeys", oUpdateHostkeys }, { "hostbasedkeytypes", oHostbasedKeyTypes }, { "ignoreunknown", oIgnoreUnknown }, + { "hpndisabled", oDeprecated }, + { "hpnbuffersize", oDeprecated }, + { "tcprcvbufpoll", oDeprecated }, + { "tcprcvbuf", oDeprecated }, { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 40c8b33..44da294 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -536,6 +536,9 @@ static struct { { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL }, { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL }, { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL }, + { "hpndisabled", sDeprecated, SSHCFG_ALL }, + { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, + { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, { NULL, sBadOption, 0 } }; |