diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-08-07 00:53:51 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-09-18 14:11:22 +1000 |
| commit | ec218c105daa9f5b192f7aa890fdb2d4fdc4e9d8 (patch) | |
| tree | 5096804b3702080ce84428fde26872b2e639abe7 | |
| parent | 239c57d5bc2253e27e3e6ad7ac52ec8c377ee24e (diff) | |
| download | openssh-git-ec218c105daa9f5b192f7aa890fdb2d4fdc4e9d8.tar.gz | |
upstream commit
Remove non-privsep test since disabling privsep is now
deprecated.
Upstream-Regress-ID: 77ad3f3d8d52e87f514a80f285c6c1229b108ce8
| -rw-r--r-- | regress/login-timeout.sh | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index 12207fd9..4c2d07dc 100644 --- a/regress/login-timeout.sh +++ b/regress/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 |