summaryrefslogtreecommitdiffstats
path: root/scp.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-01 01:28:12 +0200
committerDamien Miller <djm@mindrot.org>2017-05-01 02:05:05 +0200
commita3710d5d529a34b8f56aa62db798c70e85d576a0 (patch)
tree23ca5221f15399064bd2e15b6d6337dbc9fb127d /scp.c
parentupstream commit (diff)
downloadopenssh-a3710d5d529a34b8f56aa62db798c70e85d576a0.tar.xz
openssh-a3710d5d529a34b8f56aa62db798c70e85d576a0.zip
upstream commit
exterminate the -1 flag from scp ok markus@ Upstream-ID: 26d247f7065da15056b209cef5f594ff591b89db
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/scp.c b/scp.c
index 3de743e3a..3a651c664 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.189 2017/04/28 03:21:12 millert Exp $ */
+/* $OpenBSD: scp.c,v 1.190 2017/04/30 23:28:12 djm Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -404,7 +404,11 @@ main(int argc, char **argv)
switch (ch) {
/* User-visible flags. */
case '1':
+ fatal("SSH protocol v.1 is no longer supported");
+ break;
case '2':
+ /* Ignored */
+ break;
case '4':
case '6':
case 'C':