diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-08-10 05:35:45 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-08-10 05:37:27 +0200 |
| commit | 931f592f26239154eea3eb35a086585897b1a185 (patch) | |
| tree | 68086b884429ac40b6f86c16b820b713826082e3 /regress/scp.sh | |
| parent | upstream: Prepare for a future where scp(1) uses the SFTP protocol by (diff) | |
| download | openssh-931f592f26239154eea3eb35a086585897b1a185.tar.xz openssh-931f592f26239154eea3eb35a086585897b1a185.zip | |
upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
Diffstat (limited to 'regress/scp.sh')
| -rw-r--r-- | regress/scp.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/regress/scp.sh b/regress/scp.sh index bb0442822..358a8df66 100644 --- a/regress/scp.sh +++ b/regress/scp.sh @@ -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 |