diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-02-17 02:04:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-02-17 14:52:24 +1100 |
commit | 10577c6d96a55b877a960b2d0b75edef1b9945af (patch) | |
tree | fea8548bea1f766be05aec0203921d9f4c9e6140 | |
parent | b2afdaf1b52231aa23d2153f4a8c5a60a694dda4 (diff) |
upstream commit
For ProxyJump/-J, surround host name with brackets to
allow literal IPv6 addresses. From Dick Visser; ok dtucker@
Upstream-ID: 3a5d3b0171250daf6a5235e91bce09c1d5746bf1
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.448 2016/12/06 07:48:01 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.449 2017/02/17 02:04:15 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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; snprintf(port_s, sizeof(port_s), "%d", options.jump_port); 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 */ options.jump_user == NULL ? "" : " -l ", options.jump_user == NULL ? "" : options.jump_user, |