summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-02-29 20:30:17 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-02-29 20:30:17 +1100
commit017fd61a9266049f8bed8ef742992a75cd6ca33f (patch)
tree9618e0d88eb0791886aa59727d85474c0b6b456f
parenteffc84ce5b304a0cef62b13e72172847b6f03ceb (diff)
- dtucker@cvs.openbsd.org 2004/02/17 08:23:20
[regress/Makefile regress/login-timeout.sh] Add regression test for LoginGraceTime; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--regress/Makefile3
-rw-r--r--regress/login-timeout.sh29
3 files changed, 35 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f510abfc2..0fd35bb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 [dh.c] 15 [dh.c]
16 Reset bit counter at the right time, fixes debug output in the case where 16 Reset bit counter at the right time, fixes debug output in the case where
17 the DH group is rejected. ok markus@ 17 the DH group is rejected. ok markus@
18 - dtucker@cvs.openbsd.org 2004/02/17 08:23:20
19 [regress/Makefile regress/login-timeout.sh]
20 Add regression test for LoginGraceTime; ok markus@
18 21
1920040226 2220040226
20 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream 23 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@@ -820,4 +823,4 @@
820 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 823 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
821 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 824 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
822 825
823$Id: ChangeLog,v 1.3264 2004/02/29 09:15:08 dtucker Exp $ 826$Id: ChangeLog,v 1.3265 2004/02/29 09:30:17 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 76e28d36d..cf65b3630 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $ 1# $OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
@@ -21,6 +21,7 @@ LTESTS= connect \
21 broken-pipe \ 21 broken-pipe \
22 try-ciphers \ 22 try-ciphers \
23 yes-head \ 23 yes-head \
24 login-timeout \
24 agent \ 25 agent \
25 agent-getpeereid \ 26 agent-getpeereid \
26 agent-timeout \ 27 agent-timeout \
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
new file mode 100644
index 000000000..4ba14b3ff
--- /dev/null
+++ b/regress/login-timeout.sh
@@ -0,0 +1,29 @@
1# $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
2# Placed in the Public Domain.
3
4tid="connect after login grace timeout"
5
6trace "test login grace with privsep"
7echo "LoginGraceTime 10s" >> $OBJ/sshd_config
8echo "MaxStartups 1" >> $OBJ/sshd_config
9start_sshd
10
11(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 &
12sleep 15
13${SSH} -F $OBJ/ssh_config somehost true
14if [ $? -ne 0 ]; then
15 fail "ssh connect after login grace timeout failed with privsep"
16fi
17
18kill `cat $PIDFILE`
19
20trace "test login grace without privsep"
21echo "UsePrivilegeSeparation no" >>sshd_config
22start_sshd
23
24(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 &
25sleep 15
26${SSH} -F $OBJ/ssh_config somehost true
27if [ $? -ne 0 ]; then
28 fail "ssh connect after login grace timeout failed without privsep"
29fi