From 0121aa87bab9ad2365de2d07f2832b56d5ff9871 Mon Sep 17 00:00:00 2001 From: "tb@openbsd.org" Date: Tue, 22 Dec 2020 03:05:31 +0000 Subject: upstream: Remove lines accidentally left behind in the ProxyJump parsing fix r1.345. ok djm OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c --- readconf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'readconf.c') diff --git a/readconf.c b/readconf.c index 97c0d183..2a7870a1 100644 --- a/readconf.c +++ b/readconf.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , 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)) -- cgit v1.2.1