]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Remove lines accidentally left behind in the ProxyJump
authortb@openbsd.org <tb@openbsd.org>
Tue, 22 Dec 2020 03:05:31 +0000 (03:05 +0000)
committerDamien Miller <djm@mindrot.org>
Tue, 22 Dec 2020 04:43:59 +0000 (15:43 +1100)
parsing fix r1.345.

ok djm

OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c

readconf.c

index 97c0d183dbe3417ee966c19f1619fd4b5d8bbd50..2a7870a1d9df33fb85d0cc983b82e43bb332c999 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.346 2020/12/22 00:15:22 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.347 2020/12/22 03:05:31 tb Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2812,9 +2812,6 @@ parse_jump(const char *s, Options *o, int active)
                                goto out;
                } else {
                        /* Subsequent argument or inactive configuration */
-                       if (parse_ssh_uri(cp, NULL, NULL, NULL) == -1 &&
-                           parse_user_host_port(cp, NULL, NULL, NULL) != 0)
-                               goto out;
                        r = parse_ssh_uri(cp, NULL, NULL, NULL);
                        if (r == -1 || (r == 1 &&
                            parse_user_host_port(cp, NULL, NULL, NULL) != 0))