From e1371e4f58404d6411d9f95eb774b444cea06a26 Mon Sep 17 00:00:00 2001 From: "naddy@openbsd.org" Date: Wed, 11 Aug 2021 14:07:54 +0000 Subject: upstream: scp: tweak man page and error message for -3 by default Now that the -3 option is enabled by default, flip the documentation and error message logic from "requires -3" to "blocked by -R". ok djm@ OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020 --- scp.1 | 10 +++++----- scp.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scp.1 b/scp.1 index 972269af..68aac04b 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.99 2021/08/10 03:33:34 djm Exp $ +.\" $OpenBSD: scp.1,v 1.100 2021/08/11 14:07:54 naddy Exp $ .\" -.Dd $Mdocdate: August 10 2021 $ +.Dd $Mdocdate: August 11 2021 $ .Dt SCP 1 .Os .Sh NAME @@ -67,10 +67,10 @@ as host specifiers. .Pp When copying between two remote hosts, if the URI format is used, a .Ar port -may only be specified on the +cannot be specified on the .Ar target if the -.Fl 3 +.Fl R option is used. .Pp The options are as follows: @@ -260,7 +260,7 @@ The program must understand options. .It Fl s Use the SFTP protocol for file transfers instead of the legacy SCP protocol. -Using SFTP provides avoids invoking a shell on the remote side and provides +Using SFTP avoids invoking a shell on the remote side and provides more predictable filename handling, as the SCP protocol relied on the remote shell for expanding .Xr glob 3 diff --git a/scp.c b/scp.c index 6c78dd7f..e039350c 100644 --- a/scp.c +++ b/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.231 2021/08/11 14:05:19 naddy Exp $ */ +/* $OpenBSD: scp.c,v 1.232 2021/08/11 14:07:54 naddy Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -1095,7 +1095,7 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct) if (tport != -1 && tport != SSH_DEFAULT_PORT) { /* This would require the remote support URIs */ fatal("target port not supported with two " - "remote hosts without the -3 option"); + "remote hosts and the -R option"); } freeargs(&alist); -- cgit v1.2.3