summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/login-timeout.sh20
1 files changed, 3 insertions, 17 deletions
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index 12207fd99..4c2d07dc2 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: login-timeout.sh,v 1.8 2016/12/16 01:06:27 dtucker Exp $ 1# $OpenBSD: login-timeout.sh,v 1.9 2017/08/07 00:53:51 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="connect after login grace timeout" 4tid="connect after login grace timeout"
@@ -10,23 +10,9 @@ echo "LoginGraceTime 10s" >> $OBJ/sshd_config
10echo "MaxStartups 1" >> $OBJ/sshd_config 10echo "MaxStartups 1" >> $OBJ/sshd_config
11start_sshd 11start_sshd
12 12
13(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & 13(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 &
14sleep 15 14sleep 15
15${SSH} -F $OBJ/ssh_config somehost true 15${SSH} -F $OBJ/ssh_config somehost true
16if [ $? -ne 0 ]; then 16if [ $? -ne 0 ]; then
17 fail "ssh connect after login grace timeout failed with privsep" 17 fail "ssh connect after login grace timeout failed"
18fi
19
20stop_sshd
21
22trace "test login grace without privsep"
23echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config
24start_sshd
25sleep 1
26
27(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 &
28sleep 15
29${SSH} -F $OBJ/ssh_config somehost true
30if [ $? -ne 0 ]; then
31 fail "ssh connect after login grace timeout failed without privsep"
32fi 18fi