The branch stable/13 has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=935e29dcdd84a763ce804293dd385c2126d2ec8f
commit 935e29dcdd84a763ce804293dd385c2126d2ec8f
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-01-24 21:15:22 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-02-20 13:21:02 +0000
ssh_config.5: Remove redundant CheckHostIP default text
In 2000 (commit a95c1225217b) we changed the CheckHostIP default to
"no". We added text to ssh_config(5) documenting FreeBSD's default.
In 2021 OpenSSH made the same change, released with OpenSSH 8.5p1.
When we imported the update the added text remained, resulting in:
If the option is set to no (the default), the check will not be
executed. The default is no.
Remove the now-redundant text.
Fixes: 206be79acbde ("Vendor import of OpenSSH 8.5p1")
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 06016adaccca1958cdde4edf845f5b972be7ffc0)
(cherry picked from commit 2c97e333166d4f6f6b84da60b96a82982bb19649)
---
crypto/openssh/ssh_config.5 | 2 --
1 file changed, 2 deletions(-)
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 60e4b31a2de5..4a85589d132d 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -548,8 +548,6 @@ If the option is set to
.Cm no
(the default),
the check will not be executed.
-The default is
-.Cm no .
.It Cm Ciphers
Specifies the ciphers allowed and their order of preference.
Multiple ciphers must be comma-separated.
