summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-02-18 08:49:49 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-02-18 20:23:25 +1100
commitde1f3564cd85915b3002859873a37cb8d31ac9ce (patch)
tree01277ac6051abe415d3f92c767385b82e0cf4824
parent30144865bfa06b12239cfabc37c45e5ddc369d97 (diff)
upstream: Detect and prevent simple configuration loops when using
ProxyJump. bz#3057, ok djm@ OpenBSD-Commit-ID: 077d21c564c886c98309d871ed6f8ef267b9f037
-rw-r--r--ssh.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index 15aee569e..a983a108b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.519 2020/02/07 03:54:44 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.520 2020/02/18 08:49:49 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1208,6 +1208,14 @@ main(int ac, char **av)
1208 if (options.jump_host != NULL) { 1208 if (options.jump_host != NULL) {
1209 char port_s[8]; 1209 char port_s[8];
1210 const char *sshbin = argv0; 1210 const char *sshbin = argv0;
1211 int port = options.port, jumpport = options.jump_port;
1212
1213 if (port <= 0)
1214 port = default_ssh_port();
1215 if (jumpport <= 0)
1216 jumpport = default_ssh_port();
1217 if (strcmp(options.jump_host, host) == 0 && port == jumpport)
1218 fatal("jumphost loop via %s", options.jump_host);
1211 1219
1212 /* 1220 /*
1213 * Try to use SSH indicated by argv[0], but fall back to 1221 * Try to use SSH indicated by argv[0], but fall back to