diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2021-08-11 16:07:54 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-08-12 15:03:13 +0200 |
| commit | e1371e4f58404d6411d9f95eb774b444cea06a26 (patch) | |
| tree | 8378b34d5141b1036db6fdc5950a9f3fe73bdad0 /scp.c | |
| parent | upstream: scp: do not spawn ssh with two -s flags for (diff) | |
| download | openssh-e1371e4f58404d6411d9f95eb774b444cea06a26.tar.xz openssh-e1371e4f58404d6411d9f95eb774b444cea06a26.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |