- (tim) [regress/forward-control.sh] use sh in case login shell is csh.

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d125e3de..c58b09997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20130227
  - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
    [contrib/suse/openssh.spec] Crank version numbers
+ - (tim) [regress/forward-control.sh] use sh in case login shell is csh.
 
 20130226
  - OpenBSD CVS Sync
diff --git a/regress/forward-control.sh b/regress/forward-control.sh
index ac20bacc9..806874895 100644
--- a/regress/forward-control.sh
+++ b/regress/forward-control.sh
@@ -41,7 +41,7 @@ check_lfwd() {
         ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \
             -L$LFWD_PORT:127.0.0.1:$PORT \
             -o ExitOnForwardFailure=yes \
-            -n host "sleep 60 & echo \$! > $READY ; wait " \
+            -n host exec sh -c \'"sleep 60 & echo \$! > $READY ; wait "\' \
             >/dev/null 2>&1 &
         _sshpid=$!
         wait_for_file_to_appear $READY || \
@@ -71,7 +71,7 @@ check_rfwd() {
         ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \
             -R$RFWD_PORT:127.0.0.1:$PORT \
             -o ExitOnForwardFailure=yes \
-            -n host "sleep 60 & echo \$! > $READY ; wait " \
+            -n host exec sh -c \'"sleep 60 & echo \$! > $READY ; wait "\' \
             >/dev/null 2>&1 &
         _sshpid=$!
         wait_for_file_to_appear $READY