From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Wed, 23 Feb 2022 19:01:00 +0000 (+0000)
Subject: upstream: and we go back to testing sftp-scp after the 8.9
X-Git-Tag: V_9_0_P1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=449bcb8403adfb9724805d02a51aea76046de185;p=thirdparty%2Fopenssh-portable.git

upstream: and we go back to testing sftp-scp after the 8.9

release...

OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
---

diff --git a/scp.c b/scp.c
index 519bffa1b..04f1a649b 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.246 2022/02/23 19:01:00 deraadt Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -449,7 +449,7 @@ main(int argc, char **argv)
 	const char *errstr;
 	extern char *optarg;
 	extern int optind;
-	enum scp_mode_e mode = MODE_SCP;
+	enum scp_mode_e mode = MODE_SFTP;
 	char *sftp_direct = NULL;
 
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */