merge 5.4p1

1 files changed, 11 insertions, 1 deletions

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 9ffbb3dd4..6dec991a6 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: forwarding.sh,v 1.6 2006/07/11 18:51:21 markus Exp $
+#       $OpenBSD: forwarding.sh,v 1.7 2010/01/11 02:53:44 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -93,3 +93,13 @@ for p in 1 2; do
         fi
         sleep 10
 done
+
+for p in 2; do
+        trace "stdio forwarding proto $p"
+        cmd="${SSH} -$p -F $OBJ/ssh_config"
+        $cmd -o "ProxyCommand $cmd -q -W localhost:$PORT somehost" \
+                somehost true
+        if [ $? != 0 ]; then
+                fail "stdio forwarding proto $p"
+        fi
+done