Increase the default value of LoginGraceTime from 60 seconds to 120

seconds.

PR:		20488
Submitted by:	rwatson

3 files changed, 3 insertions, 3 deletions

diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index b3d78f74420b..8d37e10394c0 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -99,7 +99,7 @@ fill_default_server_options(ServerOptions *options)
 	if (options->server_key_bits == -1)
 		options->server_key_bits = 768;
 	if (options->login_grace_time == -1)
-		options->login_grace_time = 60;
+		options->login_grace_time = 120;
 	if (options->key_regeneration_time == -1)
 		options->key_regeneration_time = 3600;
 	if (options->permit_root_login == -1)
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 87add4d49b49..f5ad3437ae20 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -452,7 +452,7 @@ options must precede this option.
 The server disconnects after this time if the user has not
 successfully logged in.
 If the value is 0, there is no time limit.
-The default is 60 (seconds).
+The default is 120 (seconds).
 .It Cm LogLevel
 Gives the verbosity level that is used when logging messages from
 .Nm sshd .
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 46ebc1fb87ac..e1fbe8e635aa 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -9,7 +9,7 @@ Port 22
 HostKey /etc/ssh/ssh_host_key
 HostDsaKey /etc/ssh/ssh_host_dsa_key
 ServerKeyBits 768
-LoginGraceTime 60
+LoginGraceTime 120
 KeyRegenerationInterval 3600
 PermitRootLogin no
 # Rate-limit sshd connections to 5 connections per 10 seconds