From nobody Thu Feb 20 18:46:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YzMfX4Yt0z5pH29; Thu, 20 Feb 2025 18:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzMfX0mF5z3gSF; Thu, 20 Feb 2025 18:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740077172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KioSG9Kmhm5diFDxP9VCICjMu41sV3yB/XK+R5hgx0Q=; b=Wq4iSbwStarG/Z2g/eVunVcQo2a6RKsvJzu72yTE5iuYdT3B83kSui5IdfxlLkCV4SRJ3B jZgCunkbuG1Uk+ehGlnaAO1N9zpkTGe6Yhh/yZKznyDN9uEkfOxoQEukQRYs2cwYCnirnV phw5WtRDuUI9Trw9wI/LFoNkKc5JmEZslwSW0hse+ccbfcUdFTH02VIn2G+tJJgdA9LbHF p5358NNiWVKXKGHLbvH4l1dXbPZUO7j0OPtk8eU4LgbbXYKpkZiqgVv1M9PJlwKgkOPBiy udp20NYznHX6Wy7xeg7mTMhdXtMhy3RBIT5oCkZrLLUs5eL9wAHFB7bSapxAWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740077172; a=rsa-sha256; cv=none; b=o6dYCF/OdzxbqPzk72xAz+Ql9TsHZuWNAxLrwe6jh+z/W9zoC4NH7SpAxPBVacBc+EI2np CC73MVWVzCLPEOdwZTDN65p2FGHBQSqVaMdXqwlCXHJSRitQ69KiT4eNXxcRvu2gYH6YlT TDO39ZRVQvrvSAzRq6S+zSso+B/FzdL8+TSIOj0eae3rBljTpCOHVpjdwTOloE81FDrXaB QTeEJLjQyqSTLhKtEcsZ3v6sr6y+b3CDFBnfDnvheb9JA90Uh9hF3dR5BR0DpIkP7UFm6e SaggwOuz579AWLaP8ix4B28rT+XhcnRQs7QXDuWqXhLbUW4+WPZz6R55nlmJYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740077172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KioSG9Kmhm5diFDxP9VCICjMu41sV3yB/XK+R5hgx0Q=; b=bDNYR7DSTf8+MUxi1LqmJKr+/KoVBgkCsUjqijVOTsB9ssSuxVxC8p8+zBTTpMz3XeTd6L D2THOi++++GfqF0V+V1DUHrCu4n5o8boeK5jEoSkptbwPwm7xVv1wk+YUlD0qeZoXukqyZ Stc91tVdnEK0Wzou57HqXTkiKW222Qz1+q1V2WlmevGIAeUt5HKdHkzy/obNiLkqnAzMV1 R+vBMxk6yZoXSgl9kbLJuGlQwZtH5gCFtpEaD3TiWPOHhD0Z8Ry1+d6Bo6Wq4c5w1dHV73 Li4rfC5uFqDy9I4aJRo/z6ackaGqvhxsZ860HZSdrE0Uiltx8ejmG1wtNG6LaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YzMfX0DFDz1419; Thu, 20 Feb 2025 18:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51KIkBME062090; Thu, 20 Feb 2025 18:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KIkBEn062087; Thu, 20 Feb 2025 18:46:11 GMT (envelope-from git) Date: Thu, 20 Feb 2025 18:46:11 GMT Message-Id: <202502201846.51KIkBEn062087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d2b7937c2c5c - releng/13.5 - ssh_config.5: Remove redundant CheckHostIP default text List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: d2b7937c2c5c538f83ca42102cea603fd882b999 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d2b7937c2c5c538f83ca42102cea603fd882b999 commit d2b7937c2c5c538f83ca42102cea603fd882b999 Author: Ed Maste AuthorDate: 2025-01-24 21:15:22 +0000 Commit: Ed Maste CommitDate: 2025-02-20 18:45:11 +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) (cherry picked from commit 935e29dcdd84a763ce804293dd385c2126d2ec8f) Approved by: re (cperciva) --- 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.