[openssh-commits] [openssh] 01/01: upstream: revert r1.341; it breaks ProxyJump; reported by sthen@

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sun Nov 15 22:34:58 2020 +0000

    upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
    
    OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a
---
 readconf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readconf.c b/readconf.c
index e2374a85..09b5e086 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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;
 		}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.