From: djm <djm@openbsd.org>
Date: Mon, 20 Sep 2021 01:55:42 +0000 (+0000)
Subject: Switch scp back to use the old protocol by default, ahead of release.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8fad83ae50f26c3888ab3a088f842b9cf83825c6;p=openbsd

Switch scp back to use the old protocol by default, ahead of release.
We'll wait a little longer for people to pick up sftp-server(8) that
supports the extension that scp needs for ~user paths to continue
working in SFTP protocol mode. Discussed with deraadt@
---

diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 8234ddf90a1..d154e12c9ea 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.103 2021/09/10 07:11:11 dtucker Exp $
+.\" $OpenBSD: scp.1,v 1.104 2021/09/20 01:55:42 djm Exp $
 .\"
-.Dd $Mdocdate: September 10 2021 $
+.Dd $Mdocdate: September 20 2021 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -76,9 +76,7 @@ The options are as follows:
 Copies between two remote hosts are transferred through the local host.
 Without this option the data is copied directly between the two remote
 hosts.
-Note that, when using the legacy SCP protocol (via the
-.Fl O
-flag), this option
+Note that, when using the original SCP protocol (the default), this option
 selects batch mode for the second host as
 .Nm
 cannot ask for passwords or passphrases for both hosts.
@@ -111,7 +109,7 @@ This option is directly passed to
 .Xr ssh 1 .
 .It Fl D Ar sftp_server_path
 When using the SFTP protocol support via
-.Fl M ,
+.Fl s ,
 connect directly to a local SFTP server program rather than a
 remote one via
 .Xr ssh 1 .
@@ -143,12 +141,13 @@ This option is directly passed to
 .It Fl l Ar limit
 Limits the used bandwidth, specified in Kbit/s.
 .It Fl O
-Use the legacy SCP protocol for file transfers instead of the SFTP protocol.
+Use the original SCP protocol for file transfers instead of the SFTP protocol.
 Forcing the use of the SCP protocol may be necessary for servers that do
 not implement SFTP, for backwards-compatibility for particular filename
 wildcard patterns and for expanding paths with a
 .Sq ~
 prefix for older SFTP servers.
+This mode is the default.
 .It Fl o Ar ssh_option
 Can be used to pass options to
 .Nm ssh
@@ -258,6 +257,8 @@ to use for the encrypted connection.
 The program must understand
 .Xr ssh 1
 options.
+.It Fl s
+use the SFTP protocol for transfers rather than the original scp protocol.
 .It Fl T
 Disable strict filename checking.
 By default when copying files from a remote host to a local directory
@@ -294,17 +295,12 @@ debugging connection, authentication, and configuration problems.
 is based on the rcp program in
 .Bx
 source code from the Regents of the University of California.
-.Pp
-Since OpenSSH 8.8,
-.Nm
-has use the SFTP protocol for transfers by default.
 .Sh AUTHORS
 .An Timo Rinne Aq Mt tri@iki.fi
 .An Tatu Ylonen Aq Mt ylo@cs.hut.fi
 .Sh CAVEATS
-The legacy SCP protocol (selected by the
-.Fl O
-flag) requires execution of the remote user's shell to perform
+The original SCP protocol (used by default) requires execution of the
+remote user's shell to perform
 .Xr glob 3
 pattern matching.
 This requires careful quoting of any characters that have special meaning to
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 4bbd7938f71..14a4f72ac53 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.237 2021/09/18 02:03:25 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.238 2021/09/20 01:55:42 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -422,7 +422,7 @@ main(int argc, char **argv)
 	const char *errstr;
 	extern char *optarg;
 	extern int optind;
-	enum scp_mode_e mode = MODE_SFTP;
+	enum scp_mode_e mode = MODE_SCP;
 	char *sftp_direct = NULL;
 
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */