From nobody Mon Aug 31 17:32:04 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 4hYbdx0Ngmz6r70W for ; Mon, 31 Aug 2026 17:32:05 +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 4hYbdw5n7mz3Mjs for ; Mon, 31 Aug 2026 17:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788197524; 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=7T5iJR+oAwf9k1e2Dm+S0TrpavKcFrkwRnhgiO5uqqA=; b=Rrn6Cd1VxoJVPI9yi4KyD9LXHAK/nt2u07c+1X9MykW1Wgc4m3iLWubA+I7MvyvvgNxfEK 8owL1uUNuV5be3J9YzCIoCSlGe7tKGsHiuLNRvcCn+TSNs+HrAzGDBGFZUucdG8RBeSsut 0I9F44g4bgeX/TBVhTZ5nuzpauSf2NmNrbDGw6EWcDqEwJ6Eznz/z21STZ8mHHUjEDkYDu ilbhWW0iYJWIf/sqk3t5HK52oWD52zhgn4/10eQUzMyoEzv0kVJLo7iz2BPP6KbWNBoXu2 vcO8dr0aG6OUEBpLoSCYIPwZNpm5qFWYVqJqXrtSJ/TQfeTciOGKfem8w1B62Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788197524; a=rsa-sha256; cv=none; b=JpSNDYaHnP45POpR7tC63pmlGbZ4uJchPmLHowPMGVCPY5z9PFufFp+n4VBDqK24UDUfSj PnNGmzag+AzGO8XRYliml5j9GAtsohPuzngN0nFj8RMd9smSeczSuS7zAWDwTQL9NI0OXp 481EgbIda1tBiaDXoSsVSYZU0EP8PtqpMSs7I/IUb0TXEbTOBcTkgMZe22Lzskk0yaSOLO IyaOh/iyDMZt2UyNDZ1B78HIVvkXtRvM8YAVrl8o7tcBgADZtzBeokn+FloqGZZ+PhyVpq CWJf+VVYqGwOSA3Wskm9+Flw0ELIf+s2GLLyONT9Yx8Dab2tgoDKktsfvL5+mw== 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=1788197524; 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=7T5iJR+oAwf9k1e2Dm+S0TrpavKcFrkwRnhgiO5uqqA=; b=HennjJc//umLbdTk8mYtXSBeoTwvdk88FPLrNhWqLuRSf9u3bEjKdC2rkSvVQ/Jykl0uJO 3tkXsfgfigOvAih+Qa8q+RqRJe2vWgr9vZkoINvMFlbNLjui/VMMmUV1h7/aQD/IXa8aaH x2t+Msjb/xPvAcfXjaHxdQO7YandFDKboTeDt9BFxKC/s4vAWITKlwFkP9Nm9IJ14Y823H RNXql6xNVqkikzQu1cqvnv5TP4pQFz7u5ykoCiPEZdNBpbUH/f7JU67wUNyzkJcEXNxkOL YNvbYgziVUn3n50WLDdoxeZg+wO7db6F8VRJzxvkaPogXfSjCY9ZhfcqJZdGdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hYbdw45KNz5mF for ; Mon, 31 Aug 2026 17:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 31 Aug 2026 17:32:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 5ef98cb7a74b - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5ef98cb7a74b0dc5d23fee22fbb6ff3d19fc1c9b Auto-Submitted: auto-generated Date: Mon, 31 Aug 2026 17:32:04 +0000 Message-Id: <6a95ba94.395a4.677b4f4e@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5ef98cb7a74b0dc5d23fee22fbb6ff3d19fc1c9b commit 5ef98cb7a74b0dc5d23fee22fbb6ff3d19fc1c9b Author: Jose Luis Duran AuthorDate: 2026-08-25 17:27:28 +0000 Commit: Jose Luis Duran CommitDate: 2026-08-31 17:30:42 +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