diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-07-31 04:19:37 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-08-03 14:27:18 +1000 |
| commit | ced327b9fb78c94d143879ef4b2a02cbc5d38690 (patch) | |
| tree | 765b157455e1494433aec9d0b8a24207772b6af9 | |
| parent | ae7527010c44b3376b85d036a498f136597b2099 (diff) | |
| download | openssh-git-ced327b9fb78c94d143879ef4b2a02cbc5d38690.tar.gz | |
upstream: Also compare username when checking for JumpHost loops.
bz#3057, ok djm@
OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782
| -rw-r--r-- | ssh.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.533 2020/07/17 03:43:42 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.534 2020/07/31 04:19:37 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1256,19 +1256,25 @@ main(int ac, char **av) /* Fill configuration defaults. */ fill_default_options(&options); + if (options.user == NULL) + options.user = xstrdup(pw->pw_name); + /* * If ProxyJump option specified, then construct a ProxyCommand now. */ if (options.jump_host != NULL) { char port_s[8]; - const char *sshbin = argv0; + const char *jumpuser = options.jump_user, *sshbin = argv0; int port = options.port, jumpport = options.jump_port; if (port <= 0) port = default_ssh_port(); if (jumpport <= 0) jumpport = default_ssh_port(); - if (strcmp(options.jump_host, host) == 0 && port == jumpport) + if (jumpuser == NULL) + jumpuser = options.user; + if (strcmp(options.jump_host, host) == 0 && port == jumpport && + strcmp(options.user, jumpuser) == 0) fatal("jumphost loop via %s", options.jump_host); /* @@ -1371,9 +1377,6 @@ main(int ac, char **av) tty_flag = 0; } - if (options.user == NULL) - options.user = xstrdup(pw->pw_name); - /* Set up strings used to percent_expand() arguments */ if (gethostname(thishost, sizeof(thishost)) == -1) fatal("gethostname: %s", strerror(errno)); |