tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Also compare username when checking for JumpHost loops.

Browse Source 
bz#3057, ok djm@

OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782
This commit is contained in:
dtucker@openbsd.org 2020-07-31 04:19:37 +00:00 committed by Damien Miller
parent ae7527010c
commit ced327b9fb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1256,19 +1256,25 @@ main(int ac, char **av)
/* Fill configuration defaults. */ /* Fill configuration defaults. */
fill_default_options(&options); fill_default_options(&options);
if (options.user == NULL)
options.user = xstrdup(pw->pw_name);
/* /*
* If ProxyJump option specified, then construct a ProxyCommand now. * If ProxyJump option specified, then construct a ProxyCommand now.
*/ */
if (options.jump_host != NULL) { if (options.jump_host != NULL) {
char port_s[8]; char port_s[8];
const char *sshbin = argv0; const char *jumpuser = options.jump_user, *sshbin = argv0;
int port = options.port, jumpport = options.jump_port; int port = options.port, jumpport = options.jump_port;
if (port <= 0) if (port <= 0)
port = default_ssh_port(); port = default_ssh_port();
if (jumpport <= 0) if (jumpport <= 0)
jumpport = default_ssh_port(); 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); fatal("jumphost loop via %s", options.jump_host);
/* /*
@ -1371,9 +1377,6 @@ main(int ac, char **av)
tty_flag = 0; tty_flag = 0;
} }
if (options.user == NULL)
options.user = xstrdup(pw->pw_name);
/* Set up strings used to percent_expand() arguments */ /* Set up strings used to percent_expand() arguments */
if (gethostname(thishost, sizeof(thishost)) == -1) if (gethostname(thishost, sizeof(thishost)) == -1)
fatal("gethostname: %s", strerror(errno)); fatal("gethostname: %s", strerror(errno));