summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-27 13:21:57 +1000
committerDamien Miller <djm@mindrot.org>2002-09-27 13:21:57 +1000
commitd681d2602c87f7652a84b43f3521c4b06731e844 (patch)
treea6eb1821261852e2c86e75bde956c7c22582a96a
parent81ed518b9b888502cc57b23c02c47634ca508748 (diff)
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/09/25 11:17:16 [sshd_config] sync LoginGraceTime with default
-rw-r--r--ChangeLog8
-rw-r--r--sshd_config4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 24074d183..b5e3f2ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120020927
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2002/09/25 11:17:16
4 [sshd_config]
5 sync LoginGraceTime with default
6
120020925 720020925
2 - (bal) Fix issue where successfull login does not clear failure counts 8 - (bal) Fix issue where successfull login does not clear failure counts
3 in AIX. Patch by dtucker@zip.com.au ok by djm 9 in AIX. Patch by dtucker@zip.com.au ok by djm
@@ -721,4 +727,4 @@
721 save auth method before monitor_reset_key_state(); bugzilla bug #284; 727 save auth method before monitor_reset_key_state(); bugzilla bug #284;
722 ok provos@ 728 ok provos@
723 729
724$Id: ChangeLog,v 1.2482 2002/09/26 00:38:46 tim Exp $ 730$Id: ChangeLog,v 1.2483 2002/09/27 03:21:57 djm Exp $
diff --git a/sshd_config b/sshd_config
index 527a58981..36429c9d0 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.58 2002/08/21 19:38:06 stevesk Exp $ 1# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
2 2
3# This is the sshd server system-wide configuration file. See 3# This is the sshd server system-wide configuration file. See
4# sshd_config(5) for more information. 4# sshd_config(5) for more information.
@@ -32,7 +32,7 @@
32 32
33# Authentication: 33# Authentication:
34 34
35#LoginGraceTime 60 35#LoginGraceTime 120
36#PermitRootLogin yes 36#PermitRootLogin yes
37#StrictModes yes 37#StrictModes yes
38 38