svn commit: r294335 - head/crypto/openssh

[Dag-Erling Smørgrav]

Author: des
Date: Tue Jan 19 18:38:17 2016
New Revision: 294335
URL: https://svnweb.freebsd.org/changeset/base/294335

Log:
  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.

Modified:
  head/crypto/openssh/readconf.c
  head/crypto/openssh/servconf.c

Modified: head/crypto/openssh/readconf.c
==============================================================================
--- head/crypto/openssh/readconf.c	Tue Jan 19 18:35:22 2016	(r294334)
+++ head/crypto/openssh/readconf.c	Tue Jan 19 18:38:17 2016	(r294335)
@@ -280,6 +280,10 @@ static struct {
 	{ "updatehostkeys", oUpdateHostkeys },
 	{ "hostbasedkeytypes", oHostbasedKeyTypes },
 	{ "ignoreunknown", oIgnoreUnknown },
+	{ "hpndisabled", oDeprecated },
+	{ "hpnbuffersize", oDeprecated },
+	{ "tcprcvbufpoll", oDeprecated },
+	{ "tcprcvbuf", oDeprecated },
 	{ "versionaddendum", oVersionAddendum },
 
 	{ NULL, oBadOption }

Modified: head/crypto/openssh/servconf.c
==============================================================================
--- head/crypto/openssh/servconf.c	Tue Jan 19 18:35:22 2016	(r294334)
+++ head/crypto/openssh/servconf.c	Tue Jan 19 18:38:17 2016	(r294335)
@@ -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 }
 };