From 887669ef032d63cf07f53cada216fa8a0c9a7d72 Mon Sep 17 00:00:00 2001 From: "millert@openbsd.org" Date: Sat, 21 Oct 2017 23:06:24 +0000 Subject: upstream commit Add URI support to ssh, sftp and scp. For example ssh://user@host or sftp://user@host/path. The connection parameters described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since the ssh fingerprint format in the draft uses md5 with no way to specify the hash function type. OK djm@ Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc --- scp.1 | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'scp.1') diff --git a/scp.1 b/scp.1 index 76ce3336..92b63f6f 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.74 2017/05/03 21:49:18 naddy Exp $ +.\" $OpenBSD: scp.1,v 1.75 2017/10/21 23:06:24 millert Exp $ .\" -.Dd $Mdocdate: May 3 2017 $ +.Dd $Mdocdate: October 21 2017 $ .Dt SCP 1 .Os .Sh NAME @@ -27,20 +27,8 @@ .Op Fl o Ar ssh_option .Op Fl P Ar port .Op Fl S Ar program -.Sm off -.Oo -.Op Ar user No @ -.Ar host1 : -.Oc Ar file1 -.Sm on -.Ar ... -.Sm off -.Oo -.Op Ar user No @ -.Ar host2 : -.Oc Ar file2 -.Sm on -.Ek +.Ar source ... +.Ar target .Sh DESCRIPTION .Nm copies files between hosts on a network. @@ -53,15 +41,30 @@ same security as will ask for passwords or passphrases if they are needed for authentication. .Pp -File names may contain a user and host specification to indicate -that the file is to be copied to/from that host. +The +.Ar target +and +.Ar destination +may be specified as a local pathname, a remote host with optional path +in the form +.Oo Ar user Ns @ Oc Ns Ar host Ns : Ns Oo Ar path Oc , +or an scp URI in the form +.No scp:// Ns Oo Ar user Ns @ Oc Ns Ar host Ns +.Oo : Ns Ar port Oc Ns Oo / Ns Ar path Oc . Local file names can be made explicit using absolute or relative pathnames to avoid .Nm treating file names containing .Sq :\& as host specifiers. -Copies between two remote hosts are also permitted. +.Pp +When copying between two remote hosts, if the URI format is used, a +.Ar port +may only be specified on the +.Ar target +if the +.Fl 3 +option is used. .Pp The options are as follows: .Bl -tag -width Ds -- cgit v1.2.1