diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | regress/forward-control.sh | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ | |||
1 | 20130227 | 1 | 20130227 |
2 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | 2 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
3 | [contrib/suse/openssh.spec] Crank version numbers | 3 | [contrib/suse/openssh.spec] Crank version numbers |
4 | - (tim) [regress/forward-control.sh] use sh in case login shell is csh. | ||
4 | 5 | ||
5 | 20130226 | 6 | 20130226 |
6 | - OpenBSD CVS Sync | 7 | - 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() { | |||
41 | ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \ | 41 | ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \ |
42 | -L$LFWD_PORT:127.0.0.1:$PORT \ | 42 | -L$LFWD_PORT:127.0.0.1:$PORT \ |
43 | -o ExitOnForwardFailure=yes \ | 43 | -o ExitOnForwardFailure=yes \ |
44 | -n host "sleep 60 & echo \$! > $READY ; wait " \ | 44 | -n host exec sh -c \'"sleep 60 & echo \$! > $READY ; wait "\' \ |
45 | >/dev/null 2>&1 & | 45 | >/dev/null 2>&1 & |
46 | _sshpid=$! | 46 | _sshpid=$! |
47 | wait_for_file_to_appear $READY || \ | 47 | wait_for_file_to_appear $READY || \ |
@@ -71,7 +71,7 @@ check_rfwd() { | |||
71 | ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \ | 71 | ${SSH} -oProtocol=$_proto -F $OBJ/ssh_proxy \ |
72 | -R$RFWD_PORT:127.0.0.1:$PORT \ | 72 | -R$RFWD_PORT:127.0.0.1:$PORT \ |
73 | -o ExitOnForwardFailure=yes \ | 73 | -o ExitOnForwardFailure=yes \ |
74 | -n host "sleep 60 & echo \$! > $READY ; wait " \ | 74 | -n host exec sh -c \'"sleep 60 & echo \$! > $READY ; wait "\' \ |
75 | >/dev/null 2>&1 & | 75 | >/dev/null 2>&1 & |
76 | _sshpid=$! | 76 | _sshpid=$! |
77 | wait_for_file_to_appear $READY | 77 | wait_for_file_to_appear $READY |