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

upstream: revise the fix for reversed arguments on

Browse Source 
expand_proxy_command()

Always put 'host' before 'host_arg' for consistency.  ok markus@ djm@

OpenBSD-Commit-ID: 1ba5b25472779f1b1957295fcc6907bb961472a3
This commit is contained in:
naddy@openbsd.org 2020-01-11 16:23:10 +00:00 committed by Damien Miller
parent 57b181eaf2
commit b8a4ca2ebf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.324 2020/01/09 03:28:38 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.325 2020/01/11 16:23:10 naddy 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
@ -86,7 +86,7 @@ static void warn_changed_key(struct sshkey *);
/* Expand a proxy command */ /* Expand a proxy command */
static char * static char *
expand_proxy_command(const char *proxy_command, const char *user, expand_proxy_command(const char *proxy_command, const char *user,
const char *host_arg, const char *host, int port) const char *host, const char *host_arg, int port)
{ {
char *tmp, *ret, strport[NI_MAXSERV]; char *tmp, *ret, strport[NI_MAXSERV];
@ -141,7 +141,7 @@ ssh_proxy_fdpass_connect(struct ssh *ssh, const char *host,
"proxy dialer: %.100s", strerror(errno)); "proxy dialer: %.100s", strerror(errno));
command_string = expand_proxy_command(proxy_command, options.user, command_string = expand_proxy_command(proxy_command, options.user,
host_arg, host, port); host, host_arg, port);
debug("Executing proxy dialer command: %.500s", command_string); debug("Executing proxy dialer command: %.500s", command_string);
/* Fork and execute the proxy command. */ /* Fork and execute the proxy command. */
@ -224,7 +224,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
strerror(errno)); strerror(errno));
command_string = expand_proxy_command(proxy_command, options.user, command_string = expand_proxy_command(proxy_command, options.user,
host_arg, host, port); host, host_arg, port);
debug("Executing proxy command: %.500s", command_string); debug("Executing proxy command: %.500s", command_string);
/* Fork and execute the proxy command. */ /* Fork and execute the proxy command. */