diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:34:04 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:34:04 +1100 |
commit | 894823ec69fbf5249c2d181e74cf42e392c623c3 (patch) | |
tree | e2a9e8fea8fd3155dde785f94544526483449717 | |
parent | a0f3ba71a01428fb468ee7a6bc2fed42436c83f8 (diff) |
- djm@cvs.openbsd.org 2005/02/27 23:13:36
[login-timeout.sh]
avoid nameservice lookups in regress test; ok dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/login-timeout.sh | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -12,6 +12,9 @@ | |||
12 | [multiplex.sh test-exec.sh sshd-log-wrapper.sh] | 12 | [multiplex.sh test-exec.sh sshd-log-wrapper.sh] |
13 | Add optional capability to log output from regress commands; ok markus@ | 13 | Add optional capability to log output from regress commands; ok markus@ |
14 | Use with: make TEST_SSH_LOGFILE=/tmp/regress.log | 14 | Use with: make TEST_SSH_LOGFILE=/tmp/regress.log |
15 | - djm@cvs.openbsd.org 2005/02/27 23:13:36 | ||
16 | [login-timeout.sh] | ||
17 | avoid nameservice lookups in regress test; ok dtucker@ | ||
15 | 18 | ||
16 | 20050306 | 19 | 20050306 |
17 | - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor | 20 | - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor |
@@ -2298,4 +2301,4 @@ | |||
2298 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2301 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2299 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2302 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2300 | 2303 | ||
2301 | $Id: ChangeLog,v 1.3698 2005/03/07 07:33:02 dtucker Exp $ | 2304 | $Id: ChangeLog,v 1.3699 2005/03/07 07:34:04 dtucker Exp $ |
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index ce6edade5..15a887f74 100644 --- a/regress/login-timeout.sh +++ b/regress/login-timeout.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: login-timeout.sh,v 1.3 2004/03/08 10:17:12 dtucker Exp $ | 1 | # $OpenBSD: login-timeout.sh,v 1.4 2005/02/27 23:13:36 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="connect after login grace timeout" | 4 | tid="connect after login grace timeout" |
@@ -8,7 +8,7 @@ echo "LoginGraceTime 10s" >> $OBJ/sshd_config | |||
8 | echo "MaxStartups 1" >> $OBJ/sshd_config | 8 | echo "MaxStartups 1" >> $OBJ/sshd_config |
9 | start_sshd | 9 | start_sshd |
10 | 10 | ||
11 | (echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & | 11 | (echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & |
12 | sleep 15 | 12 | sleep 15 |
13 | ${SSH} -F $OBJ/ssh_config somehost true | 13 | ${SSH} -F $OBJ/ssh_config somehost true |
14 | if [ $? -ne 0 ]; then | 14 | if [ $? -ne 0 ]; then |
@@ -21,7 +21,7 @@ trace "test login grace without privsep" | |||
21 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config | 21 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config |
22 | start_sshd | 22 | start_sshd |
23 | 23 | ||
24 | (echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & | 24 | (echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & |
25 | sleep 15 | 25 | sleep 15 |
26 | ${SSH} -F $OBJ/ssh_config somehost true | 26 | ${SSH} -F $OBJ/ssh_config somehost true |
27 | if [ $? -ne 0 ]; then | 27 | if [ $? -ne 0 ]; then |