summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-04-17 03:34:42 +0000
committerDamien Miller <djm@mindrot.org>2020-04-17 14:03:36 +1000
commit267cbc87b5b6e78973ac4d3c7a6f807ed226928c (patch)
treeb843f06c0ff00ccb8442bd77e04c2e3878a5a4bd
parentc90f72d29e84b4a2709078bf5546a72c29a65177 (diff)
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
-rw-r--r--ssh.16
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 8c2792db..dce5f404 100644
--- 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