- (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling

[openssh.git] / regress / dynamic-forward.sh

diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index d090814c548abb64c88cb43548eba9ffe12c8bd1..392fc1978e222311f4300160b7b1e880a4597f6e 100644 (file)
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,14 +1,15 @@
-#      $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
+#      $OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="dynamic forwarding"
 
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
 
-if [ -x `which nc` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+DATA=/bin/ls${EXEEXT}
+
+if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
        proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
-elif [ -x `which connect` ]; then
+elif have_prog connect; then
        proxycmd="connect -S 127.0.0.1:$FWDPORT -"
 else
        echo "skipped (no suitable ProxyCommand found)"
@@ -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