diff options
author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/ssh_config | |
parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh_config')
-rw-r--r-- | crypto/openssh/ssh_config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index c251f21..6b74a6b 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $ +# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ # $FreeBSD$ # This is the ssh client system-wide configuration file. See @@ -23,6 +23,7 @@ # RhostsRSAAuthentication no # RSAAuthentication yes # PasswordAuthentication yes +# HostbasedAuthentication no # BatchMode no # CheckHostIP no # StrictHostKeyChecking ask |