summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshconnect.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f629ff037..04eefa62b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - jmc@cvs.openbsd.org 2010/04/16 06:47:04 6 - jmc@cvs.openbsd.org 2010/04/16 06:47:04
7 [ssh-keygen.1 ssh-keygen.c] 7 [ssh-keygen.1 ssh-keygen.c]
8 tweak previous; ok djm 8 tweak previous; ok djm
9 - djm@cvs.openbsd.org 2010/04/16 21:14:27
10 [sshconnect.c]
11 oops, %r => remote username, not %u
9 12
1020100416 1320100416
11 - (djm) Release openssh-5.5p1 14 - (djm) Release openssh-5.5p1
diff --git a/sshconnect.c b/sshconnect.c
index 3c8b8c7c2..f55beffe4 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.223 2010/04/16 01:47:26 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.224 2010/04/16 21:14:27 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
@@ -102,7 +102,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
102 */ 102 */
103 xasprintf(&tmp, "exec %s", proxy_command); 103 xasprintf(&tmp, "exec %s", proxy_command);
104 command_string = percent_expand(tmp, "h", host, "p", strport, 104 command_string = percent_expand(tmp, "h", host, "p", strport,
105 "u", options.user, (char *)NULL); 105 "r", 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. */