From 76107b08804f309434efce7480edc2bbd15e1bf7 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 19 Jan 2016 18:38:17 +0000 Subject: 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. --- crypto/openssh/readconf.c | 4 ++++ crypto/openssh/servconf.c | 3 +++ 2 files changed, 7 insertions(+) (limited to 'crypto') 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 } }; -- cgit v1.1