summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-28 10:24:11 +1100
committerDamien Miller <djm@mindrot.org>2014-02-28 10:24:11 +1100
commit4f7f1a9a0de24410c30952c7e16d433240422182 (patch)
tree23a811cab97a61b0f396b4339be20a74c8261bda
parentd705d987c27f68080c8798eeb5262adbdd6b4ffd (diff)
- 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
-rw-r--r--ChangeLog4
-rw-r--r--regress/login-timeout.sh4
2 files changed, 7 insertions, 1 deletions
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