tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: scp: tweak man page and error message for -3 by default

Browse Source 
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
This commit is contained in:
naddy@openbsd.org 2021-08-11 14:07:54 +00:00 committed by Damien Miller
parent 49f46f6d77
commit e1371e4f58
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" 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 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -67,10 +67,10 @@ as host specifiers.
.Pp .Pp
When copying between two remote hosts, if the URI format is used, a When copying between two remote hosts, if the URI format is used, a
.Ar port .Ar port
may only be specified on the cannot be specified on the
.Ar target .Ar target
if the if the
.Fl 3 .Fl R
option is used. option is used.
.Pp .Pp
The options are as follows: The options are as follows:
@ -260,7 +260,7 @@ The program must understand
options. options.
.It Fl s .It Fl s
Use the SFTP protocol for file transfers instead of the legacy SCP protocol. 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 more predictable filename handling, as the SCP protocol
relied on the remote shell for expanding relied on the remote shell for expanding
.Xr glob 3 .Xr glob 3

4
scp.c
View File

@ -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 * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * 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) { if (tport != -1 && tport != SSH_DEFAULT_PORT) {
/* This would require the remote support URIs */ /* This would require the remote support URIs */
fatal("target port not supported with two " fatal("target port not supported with two "
"remote hosts without the -3 option"); "remote hosts and the -R option");
} }
freeargs(&alist); freeargs(&alist);