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: fix logic error that broke URI parsing in ProxyJump 

directives; ok dtucker@

OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705
This commit is contained in:
djm@openbsd.org 2020-11-11 05:22:32 +00:00 committed by Damien Miller
parent 4340dd4392
commit add926dd1b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.340 2020/10/18 11:32:01 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.341 2020/11/11 05:22:32 djm 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
@ -2558,12 +2558,12 @@ parse_jump(const char *s, Options *o, int active)
if (first) { if (first) {
/* First argument and configuration is active */ /* 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) parse_user_host_port(cp, &user, &host, &port) != 0)
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 || if (parse_ssh_uri(cp, NULL, NULL, NULL) == -1 &&
parse_user_host_port(cp, NULL, NULL, NULL) != 0) parse_user_host_port(cp, NULL, NULL, NULL) != 0)
goto out; goto out;
} }