diff options
| author | djm <djm> | 2010-04-16 05:54:19 +0000 |
|---|---|---|
| committer | djm <djm> | 2010-04-16 05:54:19 +0000 |
| commit | cc08a3ac88a69e809741173ebcc01dc3a4e1c9d0 (patch) | |
| tree | 34a99c554b49b94180897fecc8f8132c79ce637e /sshconnect.c | |
| parent | 805fcc95a24d89f7132bb65fdc14f378b1efc9b0 (diff) | |
| download | openssh-cc08a3ac88a69e809741173ebcc01dc3a4e1c9d0.tar.gz | |
- djm@cvs.openbsd.org 2010/04/14 22:27:42
[ssh_config.5 sshconnect.c]
expand %r => remote username in ssh_config:ProxyCommand;
ok deraadt markus
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index effe6dae..ca83bc79 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.221 2010/04/10 00:04:30 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.222 2010/04/14 22:27:42 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -101,8 +101,8 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) * (e.g. Solaris) */ xasprintf(&tmp, "exec %s", proxy_command); - command_string = percent_expand(tmp, "h", host, - "p", strport, (char *)NULL); + command_string = percent_expand(tmp, "h", host, "p", strport, + "u", options.user, (char *)NULL); xfree(tmp); /* Create pipes for communicating with the proxy. */ |