From nobody Mon Aug 31 17:31:45 2026 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 4hYbdZ2xxTz6r6V4 for ; Mon, 31 Aug 2026 17:31:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hYbdZ1hW5z3M1H for ; Mon, 31 Aug 2026 17:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788197506; 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=ZWvDTIXM0b+vLWwmpRzK87ZSzN2VmixfpFIY3pEH+rk=; b=SjXmSQBfEI0DLnswRHc3auZTnAOv1qR6b+ZPC+UWzXzG0Vv+GJiRkYFoezgY6f7qz1YCRB vta6Wh0EbCG9NY8nv94mdCS5GEaohWdxJBWB/rSsjqz5QiAnYot5FTjf9k0VcloBN6aYOr KxqcBQ09JMWmBSfnslQMnL3X4AtVp+D5OboZV6WeUbrRAfK/83+6q8eKjZZvKeBJ9ronxJ qbnRqty7Jf9QGKGFOwbTRzABr7d2by9xWl6WYzSUZ/lz5cx/ilPgys/hZJ5dSULEzYBb95 +IhfwITtqDs4/+2V7yVuzfVvXhZP7R9FhoEZe2yBFwmM7Rl+f92y6/K6Vd9fXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788197506; a=rsa-sha256; cv=none; b=YSwPcC9MjrG8xVMQy95K7DsMqIJuDyLvgbuWxa36np48mEorrVfIXPGGYtz+6PomRFfwZ/ adeohGj+T1KEm3y6kzwkn3iKMlalcpR1oU1PWFhhoU0WVuSRU+5bqTQCxmZESDzW6UU9Pr mpcpEtMS3DH+YAAQ7BvpOVIxGk/ZLIvZgi8lqKtLWJHZOchMhn7Y2EGtC+Xq+Oe84eHsEU kdD8lSLbOe3R8ePaaGXsaSJsy0THWwcgdsphc59XzNM37OL8qICNZMWDOuTxfnLpbc6ykd ROPTsa64RKgrOy93kLKcr/gqNyKjbXSQBrkGd4Vvvy7lyBv4oJK+3VEcmM/ZMQ== 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=1788197506; 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=ZWvDTIXM0b+vLWwmpRzK87ZSzN2VmixfpFIY3pEH+rk=; b=IZJYnlf4YxR93XKP7HDw3UO4BXUxkD1zuKikJZDzmMnyyfr0GXHzJ9tnUi0PqUxBiQYVr2 sZeVAvg9FHAw6BpiAomdD6gwn3envZq2E3ZW8MMr9b6XeHuxSrvcMq7WqdjhisOupxo6wG qhnZCGtvPW4eU0uyrTTh8B9BNUhK+TBeDYl5vtvX6EMaydqoenhAizjZoxlTu9zvEq3aAK xgOIxz/SH5sij6UPsNs1B+bTi0g4gt7bvBG+VvRhpSTHrYoVjFKgTFrYQEz9CpZC78U483 Jp1QI31k3Se8SrATeMfOofvpRpU6+kD5isurAnHWgMd91Njj0Xhv43CqhDjHaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hYbdZ04xxz5WT for ; Mon, 31 Aug 2026 17:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38df0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 31 Aug 2026 17:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: cda01e24d28f - stable/15 - openssh: Fix shosts.equiv path in manual pages 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cda01e24d28fe56f282a37ffc9e494bddc01ff3f Auto-Submitted: auto-generated Date: Mon, 31 Aug 2026 17:31:45 +0000 Message-Id: <6a95ba81.38df0.74bf591@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=cda01e24d28fe56f282a37ffc9e494bddc01ff3f commit cda01e24d28fe56f282a37ffc9e494bddc01ff3f Author: Jose Luis Duran AuthorDate: 2026-08-25 17:27:28 +0000 Commit: Jose Luis Duran CommitDate: 2026-08-31 17:29:51 +0000 openssh: Fix shosts.equiv path in manual pages Change the path for the shosts.equiv file to consistently reflect /etc/ssh/shosts.equiv across all manual pages. This change stems from 35d4ccfb5576 ("Document FreeBSD defaults and paths.") Reviewed by: bcr, emaste Differential Revision: https://reviews.freebsd.org/D52203 (cherry picked from commit 336cc041a492b03fde96fd89915ae694cf31b551) --- crypto/openssh/ssh.1 | 4 ++-- crypto/openssh/sshd.8 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 697f4e42a4a3..e7a7f39e610c 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -903,7 +903,7 @@ Host-based authentication works as follows: If the machine the user logs in from is listed in .Pa /etc/hosts.equiv or -.Pa /etc/shosts.equiv +.Pa /etc/ssh/shosts.equiv on the remote machine, the user is non-root and the user names are the same on both sides, or if the files .Pa ~/.rhosts @@ -1624,7 +1624,7 @@ manual page for more information. This file is for host-based authentication (see above). It should only be writable by root. .Pp -.It Pa /etc/shosts.equiv +.It Pa /etc/ssh/shosts.equiv This file is used in exactly the same way as .Pa hosts.equiv , but allows host-based authentication without permitting login with diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8 index 3f5aa2618220..59ef0c98b8c1 100644 --- a/crypto/openssh/sshd.8 +++ b/crypto/openssh/sshd.8 @@ -958,7 +958,7 @@ are displayed to anyone trying to log in, and non-root connections are refused. The file should be world-readable. .Pp -.It Pa /etc/shosts.equiv +.It Pa /etc/ssh/shosts.equiv This file is used in exactly the same way as .Pa hosts.equiv , but allows host-based authentication without permitting login with