diff options
| author | Tim Rice <tim@multitalents.net> | 2013-02-26 19:35:26 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2013-02-26 19:35:26 -0800 |
| commit | a514bc05b180c8fb3b11a387b20513743fb1837d (patch) | |
| tree | f7aa86be7af8c0e078ad2329e4236f7a841d6fac | |
| parent | c0cc7ce1669d15cd1302d2d2ef9a704b5e680aee (diff) | |
- (tim) [regress/forward-control.sh] use sh in case login shell is csh.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | regress/forward-control.sh | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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 ac20bacc..80687489 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 |