diff options
| author | tb@openbsd.org <tb@openbsd.org> | 2020-12-22 03:05:31 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-22 15:43:59 +1100 |
| commit | 0121aa87bab9ad2365de2d07f2832b56d5ff9871 (patch) | |
| tree | 51bd40fceb806981a9fcb0a8643075e7673cfb1f /readconf.c | |
| parent | da4bf0db942b5f0278f33238b86235e5813d7a5a (diff) | |
| download | openssh-git-0121aa87bab9ad2365de2d07f2832b56d5ff9871.tar.gz | |
upstream: Remove lines accidentally left behind in the ProxyJump
parsing fix r1.345.
ok djm
OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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> * 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; } 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)) |