summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2021-08-11 14:07:54 +0000
committerDamien Miller <djm@mindrot.org>2021-08-12 23:03:13 +1000
commite1371e4f58404d6411d9f95eb774b444cea06a26 (patch)
tree8378b34d5141b1036db6fdc5950a9f3fe73bdad0 /scp.c
parent49f46f6d77328a3d10a758522b670a3e8c2235e7 (diff)
downloadopenssh-git-e1371e4f58404d6411d9f95eb774b444cea06a26.tar.gz
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 'scp.c')
-rw-r--r--scp.c4
1 files changed, 2 insertions, 2 deletions
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);