ugh, that's embarassing ok & thanks djm
On Mon, 21 Dec 2020, Theo Buehler wrote: > On Mon, Dec 21, 2020 at 10:15:33AM +0100, Theo Buehler wrote: > > On Mon, Dec 21, 2020 at 08:10:59PM +1100, Damien Miller wrote: > > > Sorry, this snuck back in along with another commit. > > > > > > Does this fix it? > > > > Yes. I was hesitating doing something equivalent to this, but went for > > the plain revert in my proposed diff. > > > > ok tb > > Sorry, I did not look carefully enough at the second part of the diff. > This bit should have been removed as in the first bit: > > Index: readconf.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/readconf.c,v > retrieving revision 1.345 > diff -u -p -r1.345 readconf.c > --- readconf.c 21 Dec 2020 09:19:53 -0000 1.345 > +++ readconf.c 21 Dec 2020 10:36:24 -0000 > @@ -2784,9 +2784,6 @@ parse_jump(const char *s, Options *o, in > 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)) >