aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2024-03-18 14:15:27 +0000
committerEd Maste <emaste@FreeBSD.org>2024-03-18 14:20:18 +0000
commite600fc7295a7082041388113a5d677f6c4cf7ce7 (patch)
treead34788a1eb2e4c0355ab50159345a7b152da3d2
parentf56e9a65cf81f67f90079c8ded4c088e8dd17f2e (diff)
downloadsrc-e600fc7295a7082041388113a5d677f6c4cf7ce7.tar.gz
src-e600fc7295a7082041388113a5d677f6c4cf7ce7.zip
-rw-r--r--crypto/openssh/FREEBSD-upgrade3
-rw-r--r--crypto/openssh/readconf.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 2950731c7401..ef05c55a37e3 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -173,8 +173,7 @@
10) Retired patches
- We no longer have client-side VersionAddendum, but we recognize and ignore
- the configuration options to avoid breaking existing configurations.
+ We no longer have client-side VersionAddendum.
11) PrintLastLog bugfix
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 20a769061a0d..3a64a0441641 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -330,9 +330,6 @@ static struct {
{ "obscurekeystroketiming", oObscureKeystrokeTiming },
{ "channeltimeout", oChannelTimeout },
- /* Client VersionAddendum - retired in bffe60ead024 */
- { "versionaddendum", oDeprecated },
-
{ NULL, oBadOption }
};