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

upstream commit

Browse Source 
quote [host]:port in generated ProxyJump commandline; the
[ / ] characters can confuse some shells (e.g. zsh). Reported by Lauri
Tirkkonen via bugs@

Upstream-ID: 65cdd161460e1351c3d778e974c1c2a4fa4bc182
This commit is contained in:
djm@openbsd.org 2017-03-08 12:07:47 +00:00 committed by Damien Miller
parent 18501151cf
commit 8fb15311a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.449 2017/02/17 02:04:15 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.450 2017/03/08 12:07:47 djm 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
@ -1103,7 +1103,7 @@ main(int ac, char **av)
options.proxy_use_fdpass = 0; options.proxy_use_fdpass = 0;
snprintf(port_s, sizeof(port_s), "%d", options.jump_port); snprintf(port_s, sizeof(port_s), "%d", options.jump_port);
xasprintf(&options.proxy_command, xasprintf(&options.proxy_command,
"ssh%s%s%s%s%s%s%s%s%s%.*s -W [%%h]:%%p %s", "ssh%s%s%s%s%s%s%s%s%s%.*s -W '[%%h]:%%p' %s",
/* Optional "-l user" argument if jump_user set */ /* Optional "-l user" argument if jump_user set */
options.jump_user == NULL ? "" : " -l ", options.jump_user == NULL ? "" : " -l ",
options.jump_user == NULL ? "" : options.jump_user, options.jump_user == NULL ? "" : options.jump_user,