- stevesk@cvs.openbsd.org 2002/08/21 19:38:06
[servconf.c sshd.8 sshd_config sshd_config.5] change LoginGraceTime default to 1 minute; ok mouring@ markus@
This commit is contained in:
parent
b83df8d505
commit
f771ab75f0
|
@ -7,6 +7,9 @@
|
||||||
[sshd.8]
|
[sshd.8]
|
||||||
`RSA' updated to refer to `public key', where it matters.
|
`RSA' updated to refer to `public key', where it matters.
|
||||||
okay markus@
|
okay markus@
|
||||||
|
- stevesk@cvs.openbsd.org 2002/08/21 19:38:06
|
||||||
|
[servconf.c sshd.8 sshd_config sshd_config.5]
|
||||||
|
change LoginGraceTime default to 1 minute; ok mouring@ markus@
|
||||||
|
|
||||||
20020820
|
20020820
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
|
@ -1548,4 +1551,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.2428 2002/09/04 06:24:55 djm Exp $
|
$Id: ChangeLog,v 1.2429 2002/09/04 06:25:52 djm Exp $
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: servconf.c,v 1.113 2002/07/30 17:03:55 markus Exp $");
|
RCSID("$OpenBSD: servconf.c,v 1.114 2002/08/21 19:38:06 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 = 600;
|
options->login_grace_time = 60;
|
||||||
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
4
sshd.8
|
@ -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.189 2002/08/21 11:20:59 espie Exp $
|
.\" $OpenBSD: sshd.8,v 1.190 2002/08/21 19:38:06 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
|
||||||
600 seconds).
|
60 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.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $OpenBSD: sshd_config,v 1.57 2002/07/30 17:03:55 markus Exp $
|
# $OpenBSD: sshd_config,v 1.58 2002/08/21 19:38:06 stevesk Exp $
|
||||||
|
|
||||||
# This is the sshd server system-wide configuration file. See
|
# This is the sshd server system-wide configuration file. See
|
||||||
# sshd_config(5) for more information.
|
# sshd_config(5) for more information.
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
# Authentication:
|
# Authentication:
|
||||||
|
|
||||||
#LoginGraceTime 600
|
#LoginGraceTime 60
|
||||||
#PermitRootLogin yes
|
#PermitRootLogin yes
|
||||||
#StrictModes yes
|
#StrictModes yes
|
||||||
|
|
||||||
|
|
|
@ -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.9 2002/08/12 17:30:35 stevesk Exp $
|
.\" $OpenBSD: sshd_config.5,v 1.10 2002/08/21 19:38:06 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 600 (seconds).
|
The default is 60 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 .
|
||||||
|
|
Loading…
Reference in New Issue