summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.58
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 41b5891d8..0333ba30d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 - jmc@cvs.openbsd.org 2004/06/26 09:11:14 10 - jmc@cvs.openbsd.org 2004/06/26 09:11:14
11 [ssh_config.5] 11 [ssh_config.5]
12 punctuation and grammar fixes. also, keep the options in order. 12 punctuation and grammar fixes. also, keep the options in order.
13 - jmc@cvs.openbsd.org 2004/06/26 09:14:40
14 [sshd_config.5]
15 new sentence, new line;
13 16
1420040627 1720040627
15 - (tim) update README files. 18 - (tim) update README files.
@@ -1456,4 +1459,4 @@
1456 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1459 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1457 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1460 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1458 1461
1459$Id: ChangeLog,v 1.3460 2004/06/30 12:38:52 djm Exp $ 1462$Id: ChangeLog,v 1.3461 2004/06/30 12:39:34 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 3a377ca74..09532fb8d 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.34 2004/06/13 14:01:42 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.35 2004/06/26 09:14:40 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
@@ -416,8 +416,10 @@ The default is
416.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . 416.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
417.It Cm MaxAuthTries 417.It Cm MaxAuthTries
418Specifies the maximum number of authentication attempts permitted per 418Specifies the maximum number of authentication attempts permitted per
419connection. Once the number of failures reaches half this value, additional 419connection.
420failures are logged. The default is 6. 420Once the number of failures reaches half this value,
421additional failures are logged.
422The default is 6.
421.It Cm MaxStartups 423.It Cm MaxStartups
422Specifies the maximum number of concurrent unauthenticated connections to the 424Specifies the maximum number of concurrent unauthenticated connections to the
423.Nm sshd 425.Nm sshd