diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-11-11 06:22:32 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-11-12 00:53:03 +0100 |
| commit | add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2 (patch) | |
| tree | c7e5a4c3e919e6facb78eb73a485aa1eb0e26364 /readconf.c | |
| parent | upstream: Free the previously allocated msg buffer after writing it (diff) | |
| download | openssh-add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2.tar.xz openssh-add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2.zip | |
upstream: fix logic error that broke URI parsing in ProxyJump
directives; ok dtucker@
OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705
Diffstat (limited to '')
| -rw-r--r-- | readconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c index 8da57731d..e2374a857 100644 --- a/readconf.c +++ b/readconf.c @@ -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> * 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) { /* 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; } |