summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-02-18 14:31:23 +1100
committerDamien Miller <djm@mindrot.org>2004-02-18 14:31:23 +1100
commit05a75b6e5b67390fd858eecc6046a39ae9933556 (patch)
tree8d706ca577f4325941260160c265003e12df853e
parent20e1fabace87376a9868b9bd83bd57db13f5763d (diff)
- jmc@cvs.openbsd.org 2004/02/17 19:35:21
[sshd_config.5] remove cruft left over from RhostsAuthentication removal; ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config.59
2 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index a5d3ee4d..f5a5e567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
- djm@cvs.openbsd.org 2004/02/17 11:03:08
[sftp.c]
sftp.c and sftp-int.c, together at last; ok markus@
+ - jmc@cvs.openbsd.org 2004/02/17 19:35:21
+ [sshd_config.5]
+ remove cruft left over from RhostsAuthentication removal;
+ ok markus@
20040217
- (djm) Simplify the license on code I have written. No code changes.
@@ -1877,4 +1881,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3236 2004/02/18 03:30:55 djm Exp $
+$Id: ChangeLog,v 1.3237 2004/02/18 03:31:23 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index ad3cf76d..41228248 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
.\" (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: sshd_config.5,v 1.27 2003/12/09 21:53:37 markus Exp $
+.\" $OpenBSD: sshd_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -512,13 +512,6 @@ Specifies whether public key authentication is allowed.
The default is
.Dq yes .
Note that this option applies to protocol version 2 only.
-.Cm RhostsRSAAuthentication
-should be used
-instead, because it performs RSA-based host authentication in addition
-to normal rhosts or /etc/hosts.equiv authentication.
-The default is
-.Dq no .
-This option applies to protocol version 1 only.
.It Cm RhostsRSAAuthentication
Specifies whether rhosts or /etc/hosts.equiv authentication together
with successful RSA host authentication is allowed.