summaryrefslogtreecommitdiff
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 a5d3ee4df..f5a5e5670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 - djm@cvs.openbsd.org 2004/02/17 11:03:08 8 - djm@cvs.openbsd.org 2004/02/17 11:03:08
9 [sftp.c] 9 [sftp.c]
10 sftp.c and sftp-int.c, together at last; ok markus@ 10 sftp.c and sftp-int.c, together at last; ok markus@
11 - jmc@cvs.openbsd.org 2004/02/17 19:35:21
12 [sshd_config.5]
13 remove cruft left over from RhostsAuthentication removal;
14 ok markus@
11 15
1220040217 1620040217
13 - (djm) Simplify the license on code I have written. No code changes. 17 - (djm) Simplify the license on code I have written. No code changes.
@@ -1877,4 +1881,4 @@
1877 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1881 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1878 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1882 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1879 1883
1880$Id: ChangeLog,v 1.3236 2004/02/18 03:30:55 djm Exp $ 1884$Id: ChangeLog,v 1.3237 2004/02/18 03:31:23 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index ad3cf76df..41228248c 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.27 2003/12/09 21:53:37 markus Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -512,13 +512,6 @@ Specifies whether public key authentication is allowed.
512The default is 512The default is
513.Dq yes . 513.Dq yes .
514Note that this option applies to protocol version 2 only. 514Note that this option applies to protocol version 2 only.
515.Cm RhostsRSAAuthentication
516should be used
517instead, because it performs RSA-based host authentication in addition
518to normal rhosts or /etc/hosts.equiv authentication.
519The default is
520.Dq no .
521This option applies to protocol version 1 only.
522.It Cm RhostsRSAAuthentication 515.It Cm RhostsRSAAuthentication
523Specifies whether rhosts or /etc/hosts.equiv authentication together 516Specifies whether rhosts or /etc/hosts.equiv authentication together
524with successful RSA host authentication is allowed. 517with successful RSA host authentication is allowed.