summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:11:45 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 09:38:46 +1000
commit99f95ba82673d33215dce17bfa1512b57f54ec09 (patch)
treea2fcb5c8410cf2d524b25609271b4197728779d5 /ssh.c
parent56912dea6ef63dae4eb1194e5d88973a7c6c5740 (diff)
upstream commit
remove options.protocol and client Protocol configuration knob ok markus@ Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index 38c8e837..766a1790 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.453 2017/04/30 23:10:43 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.454 2017/04/30 23:11:45 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -609,10 +609,10 @@ main(int ac, char **av)
"ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
switch (opt) {
case '1':
- options.protocol = SSH_PROTO_1;
+ fatal("SSH protocol v.1 is no longer supported");
break;
case '2':
- options.protocol = SSH_PROTO_2;
+ /* Ignored */
break;
case '4':
options.address_family = AF_INET;