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

2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 256d8c288..35055a92d 100644
--- 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
@@ -1009,4 +1010,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.2952 2003/09/04 05:16:56 dtucker Exp $
+$Id: ChangeLog,v 1.2953 2003/09/04 05:22:01 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index d090814c5..afa1f103d 100644
--- 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)"