From 197e29f1cca190d767c4b2b63a662f9a9e5da0b3 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 2 Aug 2021 23:38:27 +0000 Subject: upstream: support for using the SFTP protocol for file transfers in scp, via a new "-M sftp" option. Marked as experimental for now. Some corner-cases exist, in particular there is no attempt to provide bug-compatibility with scp's weird "double shell" quoting rules. Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@ Thanks jmc@ for improving the scp.1 bits. OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c --- scp.1 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'scp.1') diff --git a/scp.1 b/scp.1 index d9a9bb92..54285b70 100644 --- a/scp.1 +++ b/scp.1 @@ -8,9 +8,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.96 2021/07/02 05:11:21 dtucker Exp $ +.\" $OpenBSD: scp.1,v 1.97 2021/08/02 23:38:27 djm Exp $ .\" -.Dd $Mdocdate: July 2 2021 $ +.Dd $Mdocdate: August 2 2021 $ .Dt SCP 1 .Os .Sh NAME @@ -20,10 +20,12 @@ .Nm scp .Op Fl 346ABCpqrTv .Op Fl c Ar cipher +.Op Fl D Ar sftp_server_path .Op Fl F Ar ssh_config .Op Fl i Ar identity_file .Op Fl J Ar destination .Op Fl l Ar limit +.Op Fl M Ar scp | sftp .Op Fl o Ar ssh_option .Op Fl P Ar port .Op Fl S Ar program @@ -108,6 +110,13 @@ to enable compression. Selects the cipher to use for encrypting the data transfer. This option is directly passed to .Xr ssh 1 . +.It Fl D Ar sftp_server_path +When using the experimental SFTP protocol support via +.Fl M , +connect directly to a local SFTP server program rather than a +remote one via +.Xr ssh 1 . +This option may be useful in debugging the client and server. .It Fl F Ar ssh_config Specifies an alternative per-user configuration file for @@ -134,6 +143,14 @@ This option is directly passed to .Xr ssh 1 . .It Fl l Ar limit Limits the used bandwidth, specified in Kbit/s. +.It Fl M Ar scp | sftp +Specifies a mode which will be used to transfer files. +The default is to use the original +.Cm scp +protocol. +Alternately, experimental support for using the +.Cm sftp +protocol is available. .It Fl o Ar ssh_option Can be used to pass options to .Nm ssh -- cgit v1.2.1