RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-23 10:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to improve logging for dynamic-forward test

Browse Source 
previously the logs from the ssh used to exercise the forwarding
channel would clobber the logs from the ssh actually doing the
forwarding
This commit is contained in:
Damien Miller 2023-01-09 16:33:56 +11:00
parent 715bc25dcf
commit 4a5590a5ee
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/dynamic-forward.sh
View File

@ -24,7 +24,7 @@ start_ssh() {
(cat $OBJ/ssh_config.orig ; echo "$arg") > $OBJ/ssh_config (cat $OBJ/ssh_config.orig ; echo "$arg") > $OBJ/ssh_config
while [ "$error" -ne 0 -a "$n" -lt 3 ]; do while [ "$error" -ne 0 -a "$n" -lt 3 ]; do
n=`expr $n + 1` n=`expr $n + 1`
${SSH} -F $OBJ/ssh_config -f -vvv -E$TEST_SSH_LOGFILE \ ${REAL_SSH} -F $OBJ/ssh_config -f -vvv -E$TEST_SSH_LOGFILE \
-$direction $FWDPORT -oExitOnForwardFailure=yes \ -$direction $FWDPORT -oExitOnForwardFailure=yes \
somehost exec sh -c \ somehost exec sh -c \
\'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
@ -57,7 +57,7 @@ check_socks() {
for s in 4 5; do for s in 4 5; do
for h in 127.0.0.1 localhost; do for h in 127.0.0.1 localhost; do
trace "testing ssh socks version $s host $h (-$direction)" trace "testing ssh socks version $s host $h (-$direction)"
${SSH} -F $OBJ/ssh_config \ ${REAL_SSH} -q -F $OBJ/ssh_config \
-o "ProxyCommand ${proxycmd}${s} $h $PORT 2>/dev/null" \ -o "ProxyCommand ${proxycmd}${s} $h $PORT 2>/dev/null" \
somehost cat ${DATA} > ${COPY} somehost cat ${DATA} > ${COPY}
r=$? r=$?