summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-01-04 22:25:59 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-01-04 22:25:59 +0000
commitdadc2752ad5b88975f50d57c5524c118d947ebc1 (patch)
tree2f0a127074c99da87497f0f81cfe186d8d70d9e2 /usr.bin
parent4c4371430b64674c845f232528779ae9234e4446 (diff)
sync usage()/man with defaults; from stevesk@pobox.com
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.84
-rw-r--r--usr.bin/ssh/sshd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index b2ff9a3e0ca..ba1cfa9f092 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.76 2000/12/28 12:03:57 markus Exp $
+.\" $OpenBSD: sshd.8,v 1.77 2001/01/04 22:25:58 markus Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -197,7 +197,7 @@ The default is
refuses to start if there is no configuration file.
.It Fl g Ar login_grace_time
Gives the grace time for clients to authenticate themselves (default
-300 seconds).
+600 seconds).
If the client fails to authenticate the user within
this many seconds, the server disconnects and exits.
A value of zero indicates no limit.
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index f101116c9b8..ec8e782fb01 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.144 2000/12/28 12:03:58 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.145 2001/01/04 22:25:58 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -644,7 +644,7 @@ main(int ac, char **av)
fprintf(stderr, " -q Quiet (no logging)\n");
fprintf(stderr, " -p port Listen on the specified port (default: 22)\n");
fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n");
- fprintf(stderr, " -g seconds Grace period for authentication (default: 300)\n");
+ fprintf(stderr, " -g seconds Grace period for authentication (default: 600)\n");
fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n");
fprintf(stderr, " -h file File from which to read host key (default: %s)\n",
HOST_KEY_FILE);