- [regress/dynamic-forward.sh] Some "which" programs output on stderr.

diff --git a/ChangeLog b/ChangeLog
index cb378f2deb3a03ccb2929834b7a26d1e5bf035ae..00b0fd40f845eeeb855f2d4299c39ded017ff99a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
      "grep -q" -> "grep >/dev/null"
    - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
      regress/test-exec.sh] Handle different was of echoing without newlines.
+   - [regress/dynamic-forward.sh] Some "which" programs output on stderr.
 
 20030903
  - (djm) OpenBSD CVS Sync

diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index d090814c548abb64c88cb43548eba9ffe12c8bd1..afa1f103d64aa8efe74630c180e40da0371cdbef 100644 (file)
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -6,9 +6,9 @@ tid="dynamic forwarding"
 PORT=4242
 FWDPORT=4243
 
-if [ -x `which nc` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+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"
-elif [ -x `which connect` ]; then
+elif [ -x `which connect 2>&1` ]; then
        proxycmd="connect -S 127.0.0.1:$FWDPORT -"
 else
        echo "skipped (no suitable ProxyCommand found)"