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

upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too 

OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
This commit is contained in:
djm@openbsd.org 2021-08-10 03:35:45 +00:00 committed by Damien Miller
parent 391ca67fb9
commit 931f592f26
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
regress/scp-uri.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp-uri.sh,v 1.3 2021/08/03 01:05:24 djm Exp $
# $OpenBSD: scp-uri.sh,v 1.4 2021/08/10 03:35:45 djm Exp $
# Placed in the Public Domain.
tid="scp-uri"
@ -24,12 +24,11 @@ cp $OBJ/ssh_config $OBJ/ssh_config.orig
egrep -v '^ +(Port|User) +.*$' $OBJ/ssh_config.orig > $OBJ/ssh_config
for mode in scp sftp ; do
tag="$tid: $mode mode"
if test $mode = scp ; then
scpopts="-M scp -q -S ${OBJ}/scp-ssh-wrapper.scp"
tag="$tid"
scpopts="-O -q -S ${OBJ}/scp-ssh-wrapper.scp"
else
scpopts="-M sftp -D ${SFTPSERVER}"
tag="$tid: sftp mode"
scpopts="-s -D ${SFTPSERVER}"
fi
verbose "$tag: simple copy local file to remote file"
scpclean

9
regress/scp.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp.sh,v 1.12 2021/08/03 01:05:24 djm Exp $
# $OpenBSD: scp.sh,v 1.13 2021/08/10 03:35:45 djm Exp $
# Placed in the Public Domain.
tid="scp"
@ -28,12 +28,11 @@ scpclean() {
}
for mode in scp sftp ; do
tag="$tid: $mode mode"
if test $mode = scp ; then
scpopts="-M scp -q -S ${OBJ}/scp-ssh-wrapper.scp"
tag="$tid"
scpopts="-O -q -S ${OBJ}/scp-ssh-wrapper.scp"
else
scpopts="-M sftp -D ${SFTPSERVER}"
tag="$tid: sftp mode"
scpopts="-s -D ${SFTPSERVER}"
fi
verbose "tid: simple copy local file to local file"
scpclean

13
regress/scp3.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp3.sh,v 1.2 2021/08/06 09:00:18 dtucker Exp $
# $OpenBSD: scp3.sh,v 1.3 2021/08/10 03:35:45 djm Exp $
# Placed in the Public Domain.
tid="scp3"
@ -20,13 +20,14 @@ scpclean() {
chmod 755 ${DIR} ${DIR2}
}
# XXX sftp too once it's ready
for mode in scp ; do
for mode in scp sftp ; do
scpopts="-F${OBJ}/ssh_proxy -S ${SSH} -q"
tag="$tid: $mode mode"
# if test $mode = scp ; then
# scpopts="$scpopts -O"
# fi
if test $mode = scp ; then
scpopts="$scpopts -O"
else
scpopts="-s -D ${SFTPSERVER}"
fi
verbose "$tag: simple copy remote file to remote file"
scpclean