diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-09-21 03:11:36 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-21 13:12:48 +1000 |
commit | 383a33d160cefbfd1b40fef81f72eadbf9303a66 (patch) | |
tree | 720b310b9cd71d6b565ac993c8b0741e1aaeffd8 /ssh_config.5 | |
parent | 0cbed248ed81584129b67c348dbb801660f25a6a (diff) |
upstream: Treat connections with ProxyJump specified the same as ones
with a ProxyCommand set with regards to hostname canonicalisation (i.e. don't
try to canonicalise the hostname unless CanonicalizeHostname is set to
'always').
Patch from Sven Wegener via bz#2896
OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index c7192665f..2df1165f1 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.283 2018/09/20 06:58:48 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.284 2018/09/21 03:11:36 djm Exp $ |
37 | .Dd $Mdocdate: September 20 2018 $ | 37 | .Dd $Mdocdate: September 21 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -290,7 +290,9 @@ hostname lookups. | |||
290 | If set to | 290 | If set to |
291 | .Cm yes | 291 | .Cm yes |
292 | then, for connections that do not use a | 292 | then, for connections that do not use a |
293 | .Cm ProxyCommand , | 293 | .Cm ProxyCommand |
294 | or | ||
295 | .Cm ProxyJump , | ||
294 | .Xr ssh 1 | 296 | .Xr ssh 1 |
295 | will attempt to canonicalize the hostname specified on the command line | 297 | will attempt to canonicalize the hostname specified on the command line |
296 | using the | 298 | using the |