From 931f592f26239154eea3eb35a086585897b1a185 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Tue, 10 Aug 2021 03:35:45 +0000
Subject: [PATCH] upstream: adapt to scp -M flag change; make scp3.sh test SFTP
 mode too

OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
---
 regress/scp-uri.sh |  9 ++++-----
 regress/scp.sh     |  9 ++++-----
 regress/scp3.sh    | 13 +++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/regress/scp-uri.sh b/regress/scp-uri.sh
index faf5095ac..20ac3c89e 100644
--- a/regress/scp-uri.sh
+++ b/regress/scp-uri.sh
@@ -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
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
diff --git a/regress/scp3.sh b/regress/scp3.sh
index 53db81d2b..f71b15677 100644
--- a/regress/scp3.sh
+++ b/regress/scp3.sh
@@ -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