RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Darren Tucker 2003-09-04 15:22:01 +10:00
parent 53c55f4179
commit a241d87e94
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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 $

4
regress/dynamic-forward.sh
View File

@ -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)"