diff options
| author |   djm <djm@openbsd.org> | 2010-04-14 22:27:42 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-04-14 22:27:42 +0000 |
| commit | ddcb42c28519eef1c40a14b05aeb44a77ccc5752 (patch) | |
| tree | 122a5f6f0bd6a4d0bd5bd1179d64597548673753 /usr.bin/ssh/sshconnect.c | |
| parent | clean Sitecom run(4) ids. (diff) | |
| download | wireguard-openbsd-ddcb42c28519eef1c40a14b05aeb44a77ccc5752.tar.xz wireguard-openbsd-ddcb42c28519eef1c40a14b05aeb44a77ccc5752.zip | |
expand %r => remote username in ssh_config:ProxyCommand;
ok deraadt markus
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index d39bef1149b..3becf8fd524 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/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 @@ -92,8 +92,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. */ |