summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/agent-timeout.sh10
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c796e53bc..7e848eb5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120030909 120030909
2 - (tim) [regress/Makefile] Fixes for building outside of a read-only 2 - (tim) [regress/Makefile] Fixes for building outside of a read-only
3 source tree. 3 source tree.
4 - (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict
5 with shell read-only variable.
4 6
520030908 720030908
6 - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and 8 - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
@@ -1048,4 +1050,4 @@
1048 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1050 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1049 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1051 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1050 1052
1051$Id: ChangeLog,v 1.2973 2003/09/09 13:07:10 tim Exp $ 1053$Id: ChangeLog,v 1.2974 2003/09/09 15:27:40 tim Exp $
diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh
index 01d6580ab..d943b584f 100644
--- a/regress/agent-timeout.sh
+++ b/regress/agent-timeout.sh
@@ -3,7 +3,7 @@
3 3
4tid="agent timeout test" 4tid="agent timeout test"
5 5
6TIMEOUT=5 6SSHAGENT_TIMEOUT=5
7 7
8trace "start agent" 8trace "start agent"
9eval `${SSHAGENT} -s` > /dev/null 9eval `${SSHAGENT} -s` > /dev/null
@@ -13,7 +13,7 @@ if [ $r -ne 0 ]; then
13else 13else
14 trace "add keys with timeout" 14 trace "add keys with timeout"
15 for t in rsa rsa1; do 15 for t in rsa rsa1; do
16 ${SSHADD} -t ${TIMEOUT} $OBJ/$t > /dev/null 2>&1 16 ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
17 if [ $? -ne 0 ]; then 17 if [ $? -ne 0 ]; then
18 fail "ssh-add did succeed exit code 0" 18 fail "ssh-add did succeed exit code 0"
19 fi 19 fi
@@ -23,9 +23,9 @@ else
23 if [ $n -ne 2 ]; then 23 if [ $n -ne 2 ]; then
24 fail "ssh-add -l did not return 2 keys: $n" 24 fail "ssh-add -l did not return 2 keys: $n"
25 fi 25 fi
26 trace "sleeping 2*${TIMEOUT} seconds" 26 trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds"
27 sleep ${TIMEOUT} 27 sleep ${SSHAGENT_TIMEOUT}
28 sleep ${TIMEOUT} 28 sleep ${SSHAGENT_TIMEOUT}
29 ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null 29 ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null
30 if [ $? -ne 0 ]; then 30 if [ $? -ne 0 ]; then
31 fail "ssh-add -l still returns keys after timeout" 31 fail "ssh-add -l still returns keys after timeout"