- dtucker@cvs.openbsd.org 2004/06/18 06:15:51

     [multiplex.sh]
     Use -S for scp/sftp to force the use of the ssh being tested.
     ok djm@,markus@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 56c49b6ce..cd2fc1951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
    - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
      [sftp.c]
      Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@
+   - dtucker@cvs.openbsd.org 2004/06/18 06:15:51
+     [multiplex.sh]
+     Use -S for scp/sftp to force the use of the ssh being tested.
+     ok djm@,markus@
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1292,4 +1296,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3410 2004/06/18 06:23:43 dtucker Exp $
+$Id: ChangeLog,v 1.3411 2004/06/18 06:25:35 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index c19c0fe17..c167b9632 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: multiplex.sh,v 1.6 2004/06/17 14:53:27 djm Exp $
+#       $OpenBSD: multiplex.sh,v 1.7 2004/06/18 06:15:51 dtucker Exp $
 #       Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -37,13 +37,13 @@ cmp ${DATA} ${COPY}		|| fail "ssh -S ctl: corrupted copy of ${DATA}"
 rm -f ${COPY}
 trace "sftp transfer over multiplexed connection and check result"
 echo "get ${DATA} ${COPY}" | \
-        ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
+        ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1
 test -f ${COPY}                 || fail "sftp: failed copy ${DATA}" 
 cmp ${DATA} ${COPY}             || fail "sftp: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 trace "scp transfer over multiplexed connection and check result"
-${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
+${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
 test -f ${COPY}                 || fail "scp: failed copy ${DATA}" 
 cmp ${DATA} ${COPY}             || fail "scp: corrupted copy of ${DATA}"