tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Remove lines accidentally left behind in the ProxyJump 

parsing fix r1.345.

ok djm

OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c
This commit is contained in:
tb@openbsd.org 2020-12-22 03:05:31 +00:00 committed by Damien Miller
parent da4bf0db94
commit 0121aa87ba
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
readconf.c
View 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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; goto out;
} else { } else {
/* Subsequent argument or inactive configuration */ /* 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); r = parse_ssh_uri(cp, NULL, NULL, NULL);
if (r == -1 || (r == 1 && if (r == -1 || (r == 1 &&
parse_user_host_port(cp, NULL, NULL, NULL) != 0)) parse_user_host_port(cp, NULL, NULL, NULL) != 0))