From nobody Wed Feb 19 16:46:00 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 4Yyj2K1kr9z5pbhK; Wed, 19 Feb 2025 16:46:01 +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 4Yyj2K0x2nz3ff8; Wed, 19 Feb 2025 16:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739983561; 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=Xo+eay+f86OKWFZ6uwh9yRK8m/mlwA/yslXNd50j9Z0=; b=w4a3zoywcLQ0O83zdtIHi76bW6CLHDVCzChs0FLzD1NYRj3BH2DIaXHQPpNutK1WB2Ygqd qXZ7ZZzugftl18Hn/ZR9UuHqweMIkmaBTtAsCVTFf9m/VGUbUrGJDM1CY+NVXVMqE0xnCp wP+HaK0Ei9MsYDUwFgh93YNnJEipvjZr21w7AmkSaBgHS1TWQ69f766WCUJiy8rvQCQcIB wT8ztg8kDOKFjQLWApfAPn07Z450PiUpqcZE+40jTSWpa6pt4+c0hqTT+wztELcCFhCWcu kbhy+lvPDjDnQntXQfRGhuoIVBXcqZomfsIcaLLOlZGp6oCTTSVsA1zSBuEPwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739983561; a=rsa-sha256; cv=none; b=Uyg4cTbZPNFxXuQrk+OYrU6osMTLWtZ2DSNf3Pb1ffH5qUgUie5lndmW3YNNjxGFSwe67U asObdJ4MgS6Ksg8kPGm1w5m6W1Ssxp7PmQknWq42wUgSsCt8Y48Yp/c1rZTU17XX4r8H/7 5OP56j2POjfuxtM6B2Dby4wByB+y5/6KZTT/RogFCiqr84Z737oCYLyU/TG60GtH4B7nzd YiOCoutKMi6YpHNmfubBON1nNHXbzPoNm/pzo3d07zJgSbdePTyN5Y7oHgMZ0N7LIqnLtq W9lz2lTW0E/GReU+7jxQzHVHMW7XBLS6V5DuT09747CvJLKiXS6seV3ylnDaMw== 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=1739983561; 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=Xo+eay+f86OKWFZ6uwh9yRK8m/mlwA/yslXNd50j9Z0=; b=h084OG0Ch+gN/D74C8MO1sKsDlKoujwepd6Qei0lojBRNzEpI41a3n76ShWGxRASsfWsiT dIZIyHX/+KZyJxpM64J0MJUCTSNcxGdfM6K3YQMuoGS8Qk5SXE+cYzENG1P3avMCWfGYzq jH2Wb081c0wodrtdrLUHfQ9GtbkwLCokLom4iEpQDESGaElvOUk01K4+lx8JcocOXo8h3n 1x7cWoUUnVh3hHz5fehTYS9auuGqc/UEJ47FI8EYFb4J5LDMHxbMo2SGP2glTEfbzCcwIl OICADUp5P5D4me7OVqu/c/A6MG9369z8x5Ia98wIEb3zXKpd/XlqKTBf4JLbYw== 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 4Yyj2K09GNz7V; Wed, 19 Feb 2025 16:46:01 +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 51JGk0el020455; Wed, 19 Feb 2025 16:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JGk0mB020453; Wed, 19 Feb 2025 16:46:00 GMT (envelope-from git) Date: Wed, 19 Feb 2025 16:46:00 GMT Message-Id: <202502191646.51JGk0mB020453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 06016adaccca - main - 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/main X-Git-Reftype: branch X-Git-Commit: 06016adaccca1958cdde4edf845f5b972be7ffc0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=06016adaccca1958cdde4edf845f5b972be7ffc0 commit 06016adaccca1958cdde4edf845f5b972be7ffc0 Author: Ed Maste AuthorDate: 2025-01-24 21:15:22 +0000 Commit: Ed Maste CommitDate: 2025-02-19 16:45:25 +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 --- 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.