tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Darren Tucker 2004-06-18 16:25:35 +10:00
parent bd12f1741e
commit 6288dc14fc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 $

6
regress/multiplex.sh
View File

@ -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}"