From nobody Thu Feb 20 13:21:15 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 4YzDRc18Kjz5nt7R; Thu, 20 Feb 2025 13:21:16 +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 4YzDRc0RM8z46Lv; Thu, 20 Feb 2025 13:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740057676; 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=brVk+N8KlyCUQMLqcNBhqkxjgzb1NSXycQ3RU7w1hvM=; b=XdU+Li0jP7zDM9Fq6SdtvYfu99lqHxX7fyOcyQId2Vgi526mLuFeERvpMd5PdVx/00TNi5 OnLVVdjOZeAwv8F75kPcaD0udrm879IE32Y71tln5nOI2DuEmAerSxpVn7YdUAfZTTiSxy Q+sUsENTK1WCXYJj+XVAbHoVUQwVxFRdnyaiBRgQYbvFoICG4n3UCc336ff/oc4hjyHra0 skbuUcZ1nCODXsCJNdVU8lLgNDdELqAYw/SDIvwYEzTkjv+Q+3D7A6OFLGZeJbuzjGkEom 601f/JCjaWMxmzHnIl9SFTXbDM/QqDT8AuUSUjO7EGLHkcYnmwPCHyopszyriA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740057676; a=rsa-sha256; cv=none; b=UbyCrbZnNqjF5u9UkzazBecK1sW/nZ3tzfqbq9beJq6ksgWcDo+Zm3++0l2IObeA+dXR// u88fLFHlT8GB21WFZ5Zz373oPAFnx1e2Fqr7gMGDuNQBuh0n+tmQyrfxVeptlH0rru0804 LhwrMEi4q/UAp8TUVP7dVfGLbHb988e8Gu7xam5zVOtMw9vNv93jJCOoCfOwaysWczY2ND Fv2Ax98MhKNU2Irfvd9Typ7X3WoWjgpd2IrlK3lKxtx9qclFmH9/F6e9Tnx9/yKg2M8+hg j97NvtyQ5WeFk9QMf++2FgiF0mLXvYGVZvno+L6tzxtzP8spWyWs8J6/TvhfyQ== 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=1740057676; 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=brVk+N8KlyCUQMLqcNBhqkxjgzb1NSXycQ3RU7w1hvM=; b=w49GMRB1nMkGllVUNbw/QqZTLBxNUMTHhY/tQNVhwJRryukFyWqeREsV/nkGWl1370y+CH 8xXTmaTeD7ocRTdC5S278cf+5YvLWm8l9mw7TAu1zVbaOd/Sp35/dnL7lDDTRSQGfp7laY CnkTwa6ZhQ1Ud1HRm0pmONj9h1ZbWjrOqNwexbKfUjDVj1h9K2rIrBRgNt9scugvAdsHSb 4+qzdPGNCKTyjZmwINtEAiDhf+6aO8HwtVhG1BngcknUbUM/EsROyrl6ReRY1QjRI5r6XT nGxtoLLFC595+JG1KZJIy73YcF4BlL+hceDGaRJulnHjN7OBd/jEYUWK/20q8Q== 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 4YzDRb6zMGzsbB; Thu, 20 Feb 2025 13:21:15 +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 51KDLFTI056863; Thu, 20 Feb 2025 13:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KDLFiM056860; Thu, 20 Feb 2025 13:21:15 GMT (envelope-from git) Date: Thu, 20 Feb 2025 13:21:15 GMT Message-Id: <202502201321.51KDLFiM056860@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: 935e29dcdd84 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 935e29dcdd84a763ce804293dd385c2126d2ec8f Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=935e29dcdd84a763ce804293dd385c2126d2ec8f commit 935e29dcdd84a763ce804293dd385c2126d2ec8f Author: Ed Maste AuthorDate: 2025-01-24 21:15:22 +0000 Commit: Ed Maste 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.