summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-04-07 23:00:42 +0000
committerDamien Miller <djm@mindrot.org>2015-04-13 14:37:17 +1000
commit4492a4f222da4cf1e8eab12689196322e27b08c4 (patch)
treed8c8f2d94e1dd3be23f018788ce19ab856656dbd /compat.c
parentc265e2e6e932efc6d86f6cc885dea33637a67564 (diff)
upstream commit
treat Protocol=1,2|2,1 as Protocol=2 when compiled without SSH1 support; ok dtucker@ millert@
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/compat.c b/compat.c
index 4852fb70..2498168d 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.87 2015/01/19 20:20:20 markus Exp $ */
+/* $OpenBSD: compat.c,v 1.88 2015/04/07 23:00:42 djm Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -199,9 +199,11 @@ proto_spec(const char *spec)
for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
switch (atoi(p)) {
case 1:
+#ifdef WITH_SSH1
if (ret == SSH_PROTO_UNKNOWN)
ret |= SSH_PROTO_1_PREFERRED;
ret |= SSH_PROTO_1;
+#endif
break;
case 2:
ret |= SSH_PROTO_2;