diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-02-18 09:49:49 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-02-18 10:23:25 +0100 |
| commit | de1f3564cd85915b3002859873a37cb8d31ac9ce (patch) | |
| tree | 01277ac6051abe415d3f92c767385b82e0cf4824 /ssh.c | |
| parent | upstream: document -F none; with jmc@ (diff) | |
| download | openssh-de1f3564cd85915b3002859873a37cb8d31ac9ce.tar.xz openssh-de1f3564cd85915b3002859873a37cb8d31ac9ce.zip | |
upstream: Detect and prevent simple configuration loops when using
ProxyJump. bz#3057, ok djm@
OpenBSD-Commit-ID: 077d21c564c886c98309d871ed6f8ef267b9f037
Diffstat (limited to '')
| -rw-r--r-- | ssh.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.519 2020/02/07 03:54:44 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.520 2020/02/18 08:49:49 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1208,6 +1208,14 @@ main(int ac, char **av) if (options.jump_host != NULL) { char port_s[8]; const char *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) + fatal("jumphost loop via %s", options.jump_host); /* * Try to use SSH indicated by argv[0], but fall back to |