From nobody Tue Aug 25 17:28:06 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 4hTvrD23Ksz6pjCH for ; Tue, 25 Aug 2026 17:28: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTvrD0Mj3z3bc3 for ; Tue, 25 Aug 2026 17:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787678892; 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=4DKU4lGyI0D75pn/uate7eVJpiNxZ4BUHxjSxJNA7a8=; b=ZkXlbx3rvqzOXIXQgOQY8kU/LkYG5aOf94p/zLMuGkzjrOCRYDOVJKu4usAcf0ff6MHiUx YFkOG/ViSnOo0ZvJsokK+QVgypLhNKSBvoDG1ymahARBzYChxEeDXVOy1Dj1SZnlvC9nVf 0U8Yy9d7PkGIxMHYfoufFNP9m0f2ya1rfQrqlGyEPQREtK8SL4pqfys6/rPLkW+MY2xemt ssSpBOpa0bfIh4uMsQq5KRVWtoElivgJ8dnq4seG7kgfBTQtFtLZE/6HOIg4ffHIRe3SIj hGMN18D+7CgJZWvHOfU2DhazhRPN6cYkx3aahIdK3o5vYImt5VxQDRV9O+B8EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787678892; a=rsa-sha256; cv=none; b=im516Z7JmyliAduRU2uJ3rg7Ug5SKrGPlnP1CmoU4zhgqKuErq7ThJvfxPHJy3n66/fBVG ZIWQoHmXTjpx8cHh3Wiu17CpzlqzWJ1J9aOxuFLq5ce+c889r79fUO8ui/3GGJLFxQrwdF 0Su9+jnOxDohCxa/b9KeyypSo/CTarcfPE/KfhK0KK5G463n9IBedCOMfjREWdqZ1DIgnR o3N2zjKsOHSAGOYdyatWX8xIheg1XRwNQiMHZytP2/YgxUMO54KRg13jW6KvoFFCJHf0Ot pUuBS+HFIKdTlwlXK5Mk9rqYlu8m6Wo2G06WifNMoOxb/VOFWwnYoxomiXcyRA== 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=1787678892; 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=4DKU4lGyI0D75pn/uate7eVJpiNxZ4BUHxjSxJNA7a8=; b=O3IXIQYGx6+/rq1XgFCwfI5NzHRAOmAaBaiaftZDg718NCZoUeReOR3d50nLSGhB0vQpRQ mbcsTxGLZXhmF5y5lQB6sC+9k446mJGspf6sJBsi6iCSYBwbVUcD5eq8FRjK9zn55hcLtl 7FnFb0+KLg5vZ0Bw/g8N3jtVm3toS4a7sJzwjAO8Ywz8FJeJ+Yd8HO64r5vu48PZDAbJXs JiwEYdXGgwGprChibRwzaeFGt7Q9sP95Kwz8049rudnHu/qvh9xxrq+xBTvZ1AzsMU49Uh z+KXQJhqMPI9bRngiDpV6w46265u8YTaOkQQwsRCMTX8GaNi6B/XboTjK/hlgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTvrC64Frz11Pl for ; Tue, 25 Aug 2026 17:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 17:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 336cc041a492 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 336cc041a492b03fde96fd89915ae694cf31b551 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 17:28:06 +0000 Message-Id: <6a8dd0a6.3cf33.31a496bd@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=336cc041a492b03fde96fd89915ae694cf31b551 commit 336cc041a492b03fde96fd89915ae694cf31b551 Author: Jose Luis Duran AuthorDate: 2026-08-25 17:27:28 +0000 Commit: Jose Luis Duran CommitDate: 2026-08-25 17:27:28 +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 --- 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 22f385f06bd6..2ea32879e0e7 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -908,7 +908,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 @@ -1631,7 +1631,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 f436aaae7bfa..c9fb283d42a0 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