diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2020-11-15 22:34:59 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2020-11-15 22:34:59 +0000 |
| commit | c3b01052ede4c95c963c7fcab54325544e766d47 (patch) | |
| tree | 3dd3909aadc35e2786c8706f79bdacce140aece3 /usr.bin/ssh | |
| parent | bdf4d38adf5f23418f4f158fbd57fb94fa406b47 (diff) | |
revert r1.341; it breaks ProxyJump; reported by sthen@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index e7346a9c8e3..189dcd5dbcf 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.341 2020/11/11 05:22:32 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.342 2020/11/15 22:34:58 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2537,12 +2537,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; } |