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 @@
 20030909
  - (tim) [regress/Makefile] Fixes for building outside of a read-only
    source tree.
+ - (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict
+   with shell read-only variable.
 
 20030908
  - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
@@ -1048,4 +1050,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2973 2003/09/09 13:07:10 tim Exp $
+$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 @@
 
 tid="agent timeout test"
 
-TIMEOUT=5
+SSHAGENT_TIMEOUT=5
 
 trace "start agent"
 eval `${SSHAGENT} -s` > /dev/null
@@ -13,7 +13,7 @@ if [ $r -ne 0 ]; then
 else
         trace "add keys with timeout"
         for t in rsa rsa1; do
-                ${SSHADD} -t ${TIMEOUT} $OBJ/$t > /dev/null 2>&1
+                ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
                 if [ $? -ne 0 ]; then
                         fail "ssh-add did succeed exit code 0"
                 fi
@@ -23,9 +23,9 @@ else
         if [ $n -ne 2 ]; then
                 fail "ssh-add -l did not return 2 keys: $n"
         fi
-        trace "sleeping 2*${TIMEOUT} seconds"
-        sleep ${TIMEOUT}
-        sleep ${TIMEOUT}
+        trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds"
+        sleep ${SSHAGENT_TIMEOUT}
+        sleep ${SSHAGENT_TIMEOUT}
         ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null
         if [ $? -ne 0 ]; then
                 fail "ssh-add -l still returns keys after timeout"