From 4492a4f222da4cf1e8eab12689196322e27b08c4 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 7 Apr 2015 23:00:42 +0000 Subject: upstream commit treat Protocol=1,2|2,1 as Protocol=2 when compiled without SSH1 support; ok dtucker@ millert@ --- compat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'compat.c') diff --git a/compat.c b/compat.c index 4852fb709..2498168d7 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; -- cgit v1.2.3