4 files changed, 12 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index a974bfce8..2c6ec64ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030907
  - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
    Put "which" inside quotes.
+ - (dtucker) [dynamic-forward.sh forwarding.sh sftp-batch.sh (all regress/)]
+   Add ${EXEEXT}: required to work on Cygwin.
 
 20030906
  - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.
@@ -1028,4 +1030,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.2963 2003/09/06 23:22:21 dtucker Exp $
+$Id: ChangeLog,v 1.2964 2003/09/06 23:28:03 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 4931e95c9..0f175b2d9 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -5,6 +5,7 @@ tid="dynamic forwarding"
 
 PORT=4242
 FWDPORT=4243
+DATA=/bin/ls${EXEEXT}
 
 if [ -x "`which nc 2>&1`" ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
         proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
@@ -28,9 +29,9 @@ for p in 1 2; do
                 trace "testing ssh protocol $p socks version $s host $h"
                 ${SSH} -F $OBJ/ssh_config \
                         -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
-                        somehost cat /bin/ls > $OBJ/ls.copy
-                test -f $OBJ/ls.copy     || fail "failed copy /bin/ls"
-                cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
+                        somehost cat $DATA > $OBJ/ls.copy
+                test -f $OBJ/ls.copy     || fail "failed copy $DATA"
+                cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA"
             done
         done
 
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 7b281c013..dfe065dd6 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -2,6 +2,7 @@
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
+DATA=/bin/ls${EXEEXT}
 
 start_sshd
 
@@ -25,9 +26,9 @@ for p in 1 2; do
 
         trace "transfer over forwarded channels and check result"
         ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
-                somehost cat /bin/ls > $OBJ/ls.copy
-        test -f $OBJ/ls.copy                    || fail "failed copy /bin/ls"
-        cmp /bin/ls $OBJ/ls.copy                || fail "corrupted copy of /bin/ls"
+                somehost cat $DATA > $OBJ/ls.copy
+        test -f $OBJ/ls.copy                    || fail "failed copy $DATA"
+        cmp $DATA $OBJ/ls.copy                  || fail "corrupted copy of $DATA"
 
         sleep 10
 done
diff --git a/regress/sftp-batch.sh b/regress/sftp-batch.sh
index cffacb6df..0f2dafa85 100644
--- a/regress/sftp-batch.sh
+++ b/regress/sftp-batch.sh
@@ -3,7 +3,7 @@
 
 tid="sftp batchfile"
 
-DATA=/bin/ls
+DATA=/bin/ls${EXEEXT}
 COPY=${OBJ}/copy
 BATCH=${OBJ}/sftp-batch