tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) OpenBSD CVS Sync 

- stevesk@cvs.openbsd.org 2002/09/04 18:52:42
     [servconf.c sshd.8 sshd_config.5]
     default LoginGraceTime to 2m; 1m may be too short for slow systems.
     ok markus@
This commit is contained in:
Damien Miller 2002-09-05 14:35:14 +10:00
parent fc93d4bd31
commit c13486300d
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20020905
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2002/09/04 18:52:42
[servconf.c sshd.8 sshd_config.5]
default LoginGraceTime to 2m; 1m may be too short for slow systems.
ok markus@
20020903 20020903
- (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
- (djm) Fix Redhat RPM build dependancy test - (djm) Fix Redhat RPM build dependancy test
@ -1597,4 +1604,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2444 2002/09/04 13:26:29 djm Exp $ $Id: ChangeLog,v 1.2445 2002/09/05 04:35:14 djm Exp $

4
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.114 2002/08/21 19:38:06 stevesk Exp $"); RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $");
#if defined(KRB4) #if defined(KRB4)
#include <krb.h> #include <krb.h>
@ -159,7 +159,7 @@ fill_default_server_options(ServerOptions *options)
if (options->server_key_bits == -1) if (options->server_key_bits == -1)
options->server_key_bits = 768; options->server_key_bits = 768;
if (options->login_grace_time == -1) if (options->login_grace_time == -1)
options->login_grace_time = 60; options->login_grace_time = 120;
if (options->key_regeneration_time == -1) if (options->key_regeneration_time == -1)
options->key_regeneration_time = 3600; options->key_regeneration_time = 3600;
if (options->permit_root_login == PERMIT_NOT_SET) if (options->permit_root_login == PERMIT_NOT_SET)

4
sshd.8
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.190 2002/08/21 19:38:06 stevesk Exp $ .\" $OpenBSD: sshd.8,v 1.191 2002/09/04 18:52:42 stevesk Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -203,7 +203,7 @@ The default is
refuses to start if there is no configuration file. refuses to start if there is no configuration file.
.It Fl g Ar login_grace_time .It Fl g Ar login_grace_time
Gives the grace time for clients to authenticate themselves (default Gives the grace time for clients to authenticate themselves (default
60 seconds). 120 seconds).
If the client fails to authenticate the user within If the client fails to authenticate the user within
this many seconds, the server disconnects and exits. this many seconds, the server disconnects and exits.
A value of zero indicates no limit. A value of zero indicates no limit.

4
sshd_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.11 2002/08/29 22:54:10 stevesk Exp $ .\" $OpenBSD: sshd_config.5,v 1.12 2002/09/04 18:52:42 stevesk Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -379,7 +379,7 @@ options must precede this option for non port qualified addresses.
The server disconnects after this time if the user has not The server disconnects after this time if the user has not
successfully logged in. successfully logged in.
If the value is 0, there is no time limit. If the value is 0, there is no time limit.
The default is 60 seconds. The default is 120 seconds.
.It Cm LogLevel .It Cm LogLevel
Gives the verbosity level that is used when logging messages from Gives the verbosity level that is used when logging messages from
.Nm sshd . .Nm sshd .