summaryrefslogtreecommitdiff
path: root/compat.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 /compat.c
parent56912dea6ef63dae4eb1194e5d88973a7c6c5740 (diff)
upstream commit
remove options.protocol and client Protocol configuration knob ok markus@ Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/compat.c b/compat.c
index aa50d2ce8..945fd349b 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.101 2017/04/30 23:10:43 djm Exp $ */ 1/* $OpenBSD: compat.c,v 1.102 2017/04/30 23:11:45 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -232,8 +232,6 @@ proto_spec(const char *spec)
232 return ret; 232 return ret;
233 for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) { 233 for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
234 switch (atoi(p)) { 234 switch (atoi(p)) {
235 case 1:
236 break;
237 case 2: 235 case 2:
238 ret |= SSH_PROTO_2; 236 ret |= SSH_PROTO_2;
239 break; 237 break;