From 4f7f1a9a0de24410c30952c7e16d433240422182 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 28 Feb 2014 10:24:11 +1100 Subject: - djm@cvs.openbsd.org 2014/02/27 20:04:16 [login-timeout.sh] remove any existing LoginGraceTime from sshd_config before adding a specific one for the test back in --- ChangeLog | 4 ++++ regress/login-timeout.sh | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f206f56..61e12f0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,10 @@ make sure $SCP is tested on the remote end rather than whichever one happens to be in $PATH; from portable (Id sync only) + - djm@cvs.openbsd.org 2014/02/27 20:04:16 + [login-timeout.sh] + remove any existing LoginGraceTime from sshd_config before adding + a specific one for the test back in - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Crank version numbers diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index d73923b9..d9b48f39 100644 --- a/regress/login-timeout.sh +++ b/regress/login-timeout.sh @@ -1,9 +1,11 @@ -# $OpenBSD: login-timeout.sh,v 1.5 2013/05/17 10:23:52 dtucker Exp $ +# $OpenBSD: login-timeout.sh,v 1.6 2014/02/27 20:04:16 djm Exp $ # Placed in the Public Domain. tid="connect after login grace timeout" trace "test login grace with privsep" +cp $OBJ/sshd_config $OBJ/sshd_config.orig +grep -vi LoginGraceTime $OBJ/sshd_config.orig > $OBJ/sshd_config echo "LoginGraceTime 10s" >> $OBJ/sshd_config echo "MaxStartups 1" >> $OBJ/sshd_config start_sshd -- cgit v1.2.3