upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are

not considered for HostbasedAuthentication when the target user is root;
bz3148

OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752

diff --git a/ssh.1 b/ssh.1
index 8c2792db02ea124e41d3b5b8db16873feadc4191..dce5f404b3a8bd30c4df5c580991faa0d8020bc0 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.411 2020/02/16 21:15:43 naddy Exp $
-.Dd $Mdocdate: February 16 2020 $
+.\" $OpenBSD: ssh.1,v 1.412 2020/04/17 03:34:42 djm Exp $
+.Dd $Mdocdate: April 17 2020 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -843,7 +843,7 @@ If the machine the user logs in from is listed in
 .Pa /etc/hosts.equiv
 or
 .Pa /etc/shosts.equiv
-on the remote machine, and the user names are
+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
 or