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 @@
    - jmc@cvs.openbsd.org 2010/04/16 06:47:04
      [ssh-keygen.1 ssh-keygen.c]
      tweak previous; ok djm
+   - djm@cvs.openbsd.org 2010/04/16 21:14:27
+     [sshconnect.c]
+     oops, %r => remote username, not %u
 
 20100416
  - (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 @@
-/* $OpenBSD: sshconnect.c,v 1.223 2010/04/16 01:47:26 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.224 2010/04/16 21:14:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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)
          */
         xasprintf(&tmp, "exec %s", proxy_command);
         command_string = percent_expand(tmp, "h", host, "p", strport,
-            "u", options.user, (char *)NULL);
+            "r", options.user, (char *)NULL);
         xfree(tmp);
 
         /* Create pipes for communicating with the proxy. */