revert for imminent OpenSSH release, which wil ship with scp in RCP mode.

> revision 1.106
> date: 2021/10/15 14:46:46;  author: deraadt;  state: Exp;  lines: +13 -9;  commitid: w5n9B2RE38tFfggl;
> openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
> protocol for copying.  Let's get back to testing the SFTP protocol.

This will be put back once the OpenSSH release is done.

diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 639fc30..c433f71 100644 (file)
--- 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.106 2021/10/15 14:46:46 deraadt Exp $
+.\" $OpenBSD: scp.1,v 1.107 2022/02/10 04:12:38 djm Exp $
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: February 10 2022 $
 .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 709eaf7..4334cae 100644 (file)
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.244 2022/02/01 23:11:11 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -423,7 +423,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 */