[regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict

with shell read-only variable.

diff --git a/ChangeLog b/ChangeLog
index 147def92981561bffdd64991a8f73e072e8fc549..3c5450d6ad0940ae634597623070ff1befced929 100644 (file)
--- 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

diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh
index 01d6580ab6ae69a61cc1f405d0370d18a2294806..d943b584fefa09fc6683789aa5c109616eb21740 100644 (file)
--- 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"