- djm@cvs.openbsd.org 2005/06/06 11:20:36

     [auth.c auth.h misc.c misc.h ssh.c ssh_config.5 sshconnect.c]
     introduce a generic %foo expansion function. replace existing % expansion
     and add expansion to ControlPath; ok markus@

1 files changed, 7 insertions, 3 deletions

diff --git a/ssh.c b/ssh.c
index 43ecbd924..0871d06de 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.240 2005/05/27 08:30:37 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.241 2005/06/06 11:20:36 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -609,8 +609,12 @@ again:
                 options.proxy_command = NULL;
 
         if (options.control_path != NULL) {
-                options.control_path = tilde_expand_filename(
-                   options.control_path, original_real_uid);
+                snprintf(buf, sizeof(buf), "%d", options.port);
+                cp = tilde_expand_filename(options.control_path,
+                    original_real_uid);
+                options.control_path = percent_expand(cp, "p", buf, "h", host,
+                    "r", options.user, (char *)NULL);
+                xfree(cp);
         }
         if (mux_command != 0 && options.control_path == NULL)
                 fatal("No ControlPath specified for \"-O\" command");