From: djm@openbsd.org <djm@openbsd.org>
Date: Sun, 15 Nov 2020 22:34:58 +0000 (+0000)
Subject: upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
X-Git-Tag: V_8_5_P1~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9720f9adbd70ba5a994f407fe07a7d016d8d65;p=thirdparty%2Fopenssh-portable.git

upstream: revert r1.341; it breaks ProxyJump; reported by sthen@

OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a
---

diff --git a/readconf.c b/readconf.c
index e2374a857..09b5e086a 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.341 2020/11/11 05:22:32 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.342 2020/11/15 22:34:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2558,12 +2558,12 @@ parse_jump(const char *s, Options *o, int active)
 
 		if (first) {
 			/* First argument and configuration is active */
-			if (parse_ssh_uri(cp, &user, &host, &port) == -1 &&
+			if (parse_ssh_uri(cp, &user, &host, &port) == -1 ||
 			    parse_user_host_port(cp, &user, &host, &port) != 0)
 				goto out;
 		} else {
 			/* Subsequent argument or inactive configuration */
-			if (parse_ssh_uri(cp, NULL, NULL, NULL) == -1 &&
+			if (parse_ssh_uri(cp, NULL, NULL, NULL) == -1 ||
 			    parse_user_host_port(cp, NULL, NULL, NULL) != 0)
 				goto out;
 		}