diff options
| author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:54:19 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:54:19 +1000 |
| commit | b1b17047e39b88f640a6e55141cd1073ee6e55e4 (patch) | |
| tree | 72f2cd2a74e45dede6c78486f5aef57f54ce6817 /sshconnect.c | |
| parent | 601a23c02cb1612e9596f4ce7bfa261525363c5d (diff) | |
- 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 effe6dae8..ca83bc792 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sshconnect.c,v 1.221 2010/04/10 00:04:30 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.222 2010/04/14 22:27:42 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
| 101 | * (e.g. Solaris) | 101 | * (e.g. Solaris) |
| 102 | */ | 102 | */ |
| 103 | xasprintf(&tmp, "exec %s", proxy_command); | 103 | xasprintf(&tmp, "exec %s", proxy_command); |
| 104 | command_string = percent_expand(tmp, "h", host, | 104 | command_string = percent_expand(tmp, "h", host, "p", strport, |
| 105 | "p", strport, (char *)NULL); | 105 | "u", options.user, (char *)NULL); |
| 106 | xfree(tmp); | 106 | xfree(tmp); |
| 107 | 107 | ||
| 108 | /* Create pipes for communicating with the proxy. */ | 108 | /* Create pipes for communicating with the proxy. */ |