Date: Tue, 8 Aug 2023 16:49:14 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c734abca9540 - stable/12 - ssh: comment deprecated option handling for retired local patches Message-ID: <202308081649.378GnETm057657@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c734abca9540fc8af5c790e9d05fc0dcb77d78eb commit c734abca9540fc8af5c790e9d05fc0dcb77d78eb Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-08-08 16:48:45 +0000 ssh: comment deprecated option handling for retired local patches Older versions of FreeBSD included the HPN patch set and provided client-side VersionAddendum. Both of these changes have been retired but we've retained the option parsing for backwards compatibility to avoid breaking upgrades. Add comment references to the relevant commits. Sponsored by: The FreeBSD Foundation (cherry picked from commit a93cbba2deed209a30da1ecffa637bf5c61b7641) (cherry picked from commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8) --- crypto/openssh/readconf.c | 2 ++ crypto/openssh/servconf.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 2bb38ff70a19..798a170c4604 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -325,12 +325,14 @@ static struct { { "knownhostscommand", oKnownHostsCommand }, { "requiredrsasize", oRequiredRSASize }, + /* HPN patch - retired in 60c59fad8806 */ { "hpndisabled", oDeprecated }, { "hpnbuffersize", oDeprecated }, { "tcprcvbufpoll", oDeprecated }, { "tcprcvbuf", oDeprecated }, { "noneenabled", oUnsupported }, { "noneswitch", oUnsupported }, + /* Client VersionAddendum - retired in main in bffe60ead024 */ { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 1dd313005089..2b0dd936bc78 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -695,10 +695,13 @@ static struct { { "requiredrsasize", sRequiredRSASize, SSHCFG_ALL }, { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ + + /* HPN patch - retired in 60c59fad8806 */ { "noneenabled", sUnsupported, SSHCFG_ALL }, { "hpndisabled", sDeprecated, SSHCFG_ALL }, { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, + { NULL, sBadOption, 0 } };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308081649.378GnETm057657>