diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-08-07 00:53:52 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-08-07 00:53:52 +0000 |
| commit | d88199b39060c60b5fe45eacfab703c5bb052f9f (patch) | |
| tree | abbc84b2c9c13e24370859bc8e607e43ea202467 | |
| parent | c098084d739b04b4443b31c7c5ac9b9588147fbd (diff) | |
Remove non-privsep test since disabling privsep is now deprecated.
| -rw-r--r-- | regress/usr.bin/ssh/login-timeout.sh | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/regress/usr.bin/ssh/login-timeout.sh b/regress/usr.bin/ssh/login-timeout.sh index 12207fd99ee..4c2d07dc255 100644 --- a/regress/usr.bin/ssh/login-timeout.sh +++ b/regress/usr.bin/ssh/login-timeout.sh @@ -1,4 +1,4 @@ -# $OpenBSD: login-timeout.sh,v 1.8 2016/12/16 01:06:27 dtucker Exp $ +# $OpenBSD: login-timeout.sh,v 1.9 2017/08/07 00:53:51 dtucker Exp $ # Placed in the Public Domain. tid="connect after login grace timeout" @@ -10,23 +10,9 @@ echo "LoginGraceTime 10s" >> $OBJ/sshd_config echo "MaxStartups 1" >> $OBJ/sshd_config start_sshd -(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & +(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & sleep 15 ${SSH} -F $OBJ/ssh_config somehost true if [ $? -ne 0 ]; then - fail "ssh connect after login grace timeout failed with privsep" -fi - -stop_sshd - -trace "test login grace without privsep" -echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config -start_sshd -sleep 1 - -(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & -sleep 15 -${SSH} -F $OBJ/ssh_config somehost true -if [ $? -ne 0 ]; then - fail "ssh connect after login grace timeout failed without privsep" + fail "ssh connect after login grace timeout failed" fi |