summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/dynamic-forward.sh7
-rw-r--r--regress/forwarding.sh7
-rw-r--r--regress/sftp-batch.sh2
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 @@
120030907 120030907
2 - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] 2 - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
3 Put "which" inside quotes. 3 Put "which" inside quotes.
4 - (dtucker) [dynamic-forward.sh forwarding.sh sftp-batch.sh (all regress/)]
5 Add ${EXEEXT}: required to work on Cygwin.
4 6
520030906 720030906
6 - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. 8 - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.
@@ -1028,4 +1030,4 @@
1028 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1030 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1029 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1031 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1030 1032
1031$Id: ChangeLog,v 1.2963 2003/09/06 23:22:21 dtucker Exp $ 1033$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"
5 5
6PORT=4242 6PORT=4242
7FWDPORT=4243 7FWDPORT=4243
8DATA=/bin/ls${EXEEXT}
8 9
9if [ -x "`which nc 2>&1`" ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then 10if [ -x "`which nc 2>&1`" ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
10 proxycmd="nc -x 127.0.0.1:$FWDPORT -X" 11 proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
@@ -28,9 +29,9 @@ for p in 1 2; do
28 trace "testing ssh protocol $p socks version $s host $h" 29 trace "testing ssh protocol $p socks version $s host $h"
29 ${SSH} -F $OBJ/ssh_config \ 30 ${SSH} -F $OBJ/ssh_config \
30 -o "ProxyCommand ${proxycmd}${s} $h $PORT" \ 31 -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
31 somehost cat /bin/ls > $OBJ/ls.copy 32 somehost cat $DATA > $OBJ/ls.copy
32 test -f $OBJ/ls.copy || fail "failed copy /bin/ls" 33 test -f $OBJ/ls.copy || fail "failed copy $DATA"
33 cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" 34 cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA"
34 done 35 done
35 done 36 done
36 37
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 @@
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
5DATA=/bin/ls${EXEEXT}
5 6
6start_sshd 7start_sshd
7 8
@@ -25,9 +26,9 @@ for p in 1 2; do
25 26
26 trace "transfer over forwarded channels and check result" 27 trace "transfer over forwarded channels and check result"
27 ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \ 28 ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
28 somehost cat /bin/ls > $OBJ/ls.copy 29 somehost cat $DATA > $OBJ/ls.copy
29 test -f $OBJ/ls.copy || fail "failed copy /bin/ls" 30 test -f $OBJ/ls.copy || fail "failed copy $DATA"
30 cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" 31 cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA"
31 32
32 sleep 10 33 sleep 10
33done 34done
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 @@
3 3
4tid="sftp batchfile" 4tid="sftp batchfile"
5 5
6DATA=/bin/ls 6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy 7COPY=${OBJ}/copy
8BATCH=${OBJ}/sftp-batch 8BATCH=${OBJ}/sftp-batch
9 9