From nobody Thu Feb 20 13:01:48 2025 X-Original-To: dev-commits-src-all@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 4YzD191wBtz5nrpY; Thu, 20 Feb 2025 13:01:49 +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 4YzD183W4qz40qv; Thu, 20 Feb 2025 13:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740056508; 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=PJXXZpbVRlLVzmVuJ4qvFc4Wk8Lk7ZfL90QtIcOvgcU=; b=Rril6R/REg71OzFlY6KMFqNuiXwcJhwO/JidaSqrF22uynNopObt9ugjCtu+wyXWGUed8f HklI80nchbSuTJfya2ajvQE2OdJwB8FFQ1rkOFepUfvFbYapvul0rf/6AMAQibyelrA+YI ZQC1eFaBky5VJxwsf+W4qWyR1bq3B46VnuSIlkLLkwATpWqqufnJ9hhmWdtFkz+u5GehnO n9O+JKD9W4sMVVA8J9Zqlgnw3h3sz/U/G50+X6dDQKD/U77eAWfhjPW2qilk5OLgUAmoT3 kSD0X885+PNMAFFWYggbF1DL00qoseqz9KNhzCUjUNZdlI9obkGqPMK4pAjSOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740056508; a=rsa-sha256; cv=none; b=OXD5byjCwZJ1qDRfPxHKM7haBA8WaUXhJ1ZoJZxHPZ5cfB5f8MWyjfxMCcfHJQWyTbRY1M p3mwzsPwWPciPnWCMSrERPhh+AppDr390D2zHE3TMNJqeDe/ArD75xlFfrraHGtyDDIlDR 6rg4QH6Im+AfJwLncU3khzV7A3OTx2bTYSllawb8rA+qDycLzbOuqdz2S/fs/Oo4ZSOr9w dMMhyvZGq1yRM8AWbf+s67EquVVTcR3OJGedL1HgFlTT7P8AG89Hh65/cPc6G+8T+oD9w4 55qYoK7Q7qIUiI9vldRp9KtOq7YHtHBrM7xfGqUdZkp9Obcnrr1SPfqAA+tF0Q== 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=1740056508; 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=PJXXZpbVRlLVzmVuJ4qvFc4Wk8Lk7ZfL90QtIcOvgcU=; b=CngZUreszh0rWM4quSG8xsSw2NaUbfYReLfdm3auk7xesc3CMdAzYDMOndSWO1OmhsGyTo ZkrU8fqjLZSn367Wvr00+xEk3FAML/PyStzIpG29BEr1VUxvgb2K+doyAKFilmLSf2Zsi7 rZWyP3oIRgqY7itz6r9zcVvxxi+aX3kIoXzRNfMs4pv27bcLqfPrL9GYWvOndQDepxTbyn SeKAhTppFtqudKI7aa01x+PNhN7Pt4tOwilYg0kTCPvwdhZhcB+GokASkAYJyhlZ0vgeE0 hm6XUyWp/KB8M/DmHOxzIaQTTiTPCOAl/S7wB6Y5CtMDkiwEec+jRHEBs9SVvQ== 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 4YzD182qzqzsXv; Thu, 20 Feb 2025 13:01:48 +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 51KD1mTE020646; Thu, 20 Feb 2025 13:01:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KD1m61020643; Thu, 20 Feb 2025 13:01:48 GMT (envelope-from git) Date: Thu, 20 Feb 2025 13:01:48 GMT Message-Id: <202502201301.51KD1m61020643@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: 2c97e333166d - stable/14 - ssh_config.5: Remove redundant CheckHostIP default text List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c97e333166d4f6f6b84da60b96a82982bb19649 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2c97e333166d4f6f6b84da60b96a82982bb19649 commit 2c97e333166d4f6f6b84da60b96a82982bb19649 Author: Ed Maste AuthorDate: 2025-01-24 21:15:22 +0000 Commit: Ed Maste CommitDate: 2025-02-20 13:01:24 +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) --- 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 60b9b279d0b3..134587d3b85b 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.