2 files changed, 31 insertions, 1 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 76e28d36d..cf65b3630 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -21,6 +21,7 @@ LTESTS= 	connect \
                 broken-pipe \
                 try-ciphers \
                 yes-head \
+                login-timeout \
                 agent \
                 agent-getpeereid \
                 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 @@
+#       $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
+#       Placed in the Public Domain.
+
+tid="connect after login grace timeout"
+
+trace "test login grace with privsep"
+echo "LoginGraceTime 10s" >> $OBJ/sshd_config
+echo "MaxStartups 1" >> $OBJ/sshd_config
+start_sshd
+
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${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
+
+kill `cat $PIDFILE`
+
+trace "test login grace without privsep"
+echo "UsePrivilegeSeparation no" >>sshd_config
+start_sshd
+
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${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"
+fi