diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-06-01 03:11:49 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-06-01 13:14:54 +1000 |
| commit | d8748b91d1d6c108c0c260ed41fa55f37b9ef34b (patch) | |
| tree | 2bcedc2023514a24ef441b2dac0628f32bb7b419 /ssh.c | |
| parent | fbb4b5fd4f8e0bb89732670a01954e18b69e15ba (diff) | |
upstream: prefer argv0 to "ssh" when re-executing ssh for ProxyJump
directive; bz2831, feedback and ok dtucker@
OpenBSD-Commit-ID: 3cec709a131499fbb0c1ea8a0a9e0b0915ce769e
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.477 2018/04/14 21:50:41 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.478 2018/06/01 03:11:49 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1171,6 +1171,14 @@ main(int ac, char **av) */ if (options.jump_host != NULL) { char port_s[8]; + const char *sshbin = argv0; + + /* + * Try to use SSH indicated by argv[0], but fall back to + * "ssh" if it appears unavailable. + */ + if (strchr(argv0, '/') != NULL && access(argv0, X_OK) != 0) + sshbin = "ssh"; /* Consistency check */ if (options.proxy_command != NULL) @@ -1179,7 +1187,8 @@ 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", + "%s%s%s%s%s%s%s%s%s%s%.*s -W '[%%h]:%%p' %s", + sshbin, /* Optional "-l user" argument if jump_user set */ options.jump_user == NULL ? "" : " -l ", options.jump_user == NULL ? "" : options.jump_user, |