summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--servconf.c4
-rw-r--r--sshd.84
-rw-r--r--sshd_config.54
4 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 48afa6322..d24053bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120020905
2 - (djm) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2002/09/04 18:52:42
4 [servconf.c sshd.8 sshd_config.5]
5 default LoginGraceTime to 2m; 1m may be too short for slow systems.
6 ok markus@
7
120020903 820020903
2 - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt 9 - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
3 - (djm) Fix Redhat RPM build dependancy test 10 - (djm) Fix Redhat RPM build dependancy test
@@ -1597,4 +1604,4 @@
1597 - (stevesk) entropy.c: typo in debug message 1604 - (stevesk) entropy.c: typo in debug message
1598 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1605 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1599 1606
1600$Id: ChangeLog,v 1.2444 2002/09/04 13:26:29 djm Exp $ 1607$Id: ChangeLog,v 1.2445 2002/09/05 04:35:14 djm Exp $
diff --git a/servconf.c b/servconf.c
index 211ebf6b0..e3939df40 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.114 2002/08/21 19:38:06 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $");
14 14
15#if defined(KRB4) 15#if defined(KRB4)
16#include <krb.h> 16#include <krb.h>
@@ -159,7 +159,7 @@ fill_default_server_options(ServerOptions *options)
159 if (options->server_key_bits == -1) 159 if (options->server_key_bits == -1)
160 options->server_key_bits = 768; 160 options->server_key_bits = 768;
161 if (options->login_grace_time == -1) 161 if (options->login_grace_time == -1)
162 options->login_grace_time = 60; 162 options->login_grace_time = 120;
163 if (options->key_regeneration_time == -1) 163 if (options->key_regeneration_time == -1)
164 options->key_regeneration_time = 3600; 164 options->key_regeneration_time = 3600;
165 if (options->permit_root_login == PERMIT_NOT_SET) 165 if (options->permit_root_login == PERMIT_NOT_SET)
diff --git a/sshd.8 b/sshd.8
index c195c959e..b3b91964c 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.190 2002/08/21 19:38:06 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.191 2002/09/04 18:52:42 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -203,7 +203,7 @@ The default is
203refuses to start if there is no configuration file. 203refuses to start if there is no configuration file.
204.It Fl g Ar login_grace_time 204.It Fl g Ar login_grace_time
205Gives the grace time for clients to authenticate themselves (default 205Gives the grace time for clients to authenticate themselves (default
20660 seconds). 206120 seconds).
207If the client fails to authenticate the user within 207If the client fails to authenticate the user within
208this many seconds, the server disconnects and exits. 208this many seconds, the server disconnects and exits.
209A value of zero indicates no limit. 209A value of zero indicates no limit.
diff --git a/sshd_config.5 b/sshd_config.5
index 4e6e4c863..8d90785fc 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.11 2002/08/29 22:54:10 stevesk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.12 2002/09/04 18:52:42 stevesk 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
@@ -379,7 +379,7 @@ options must precede this option for non port qualified addresses.
379The server disconnects after this time if the user has not 379The server disconnects after this time if the user has not
380successfully logged in. 380successfully logged in.
381If the value is 0, there is no time limit. 381If the value is 0, there is no time limit.
382The default is 60 seconds. 382The default is 120 seconds.
383.It Cm LogLevel 383.It Cm LogLevel
384Gives the verbosity level that is used when logging messages from 384Gives the verbosity level that is used when logging messages from
385.Nm sshd . 385.Nm sshd .