1 files changed, 25 insertions, 14 deletions

diff --git a/ssh.c b/ssh.c
index 03a23fb6a..ee0b16dc2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.445 2016/07/17 04:20:16 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.448 2016/12/06 07:48:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -109,6 +109,7 @@
 #include "version.h"
 #include "ssherr.h"
 #include "myproposal.h"
+#include "utf8.h"
 
 #ifdef ENABLE_PKCS11
 #include "ssh-pkcs11.h"
@@ -213,10 +214,6 @@ static int ssh_session2(void);
 static void load_public_identity_files(void);
 static void main_sigchld_handler(int);
 
-/* from muxclient.c */
-void muxclient(const char *);
-void muxserver_listen(void);
-
 /* ~/ expand a list of paths. NB. assumes path[n] is heap-allocated. */
 static void
 tilde_expand_paths(char **paths, u_int num_paths)
@@ -593,7 +590,7 @@ main(int ac, char **av)
          */
         umask(022);
 
-        setlocale(LC_CTYPE, "");
+        msetlocale();
 
         /*
          * Initialize option structure to indicate that no values have been
@@ -668,6 +665,8 @@ main(int ac, char **av)
                                 muxclient_command = SSHMUX_COMMAND_STOP;
                         else if (strcmp(optarg, "cancel") == 0)
                                 muxclient_command = SSHMUX_COMMAND_CANCEL_FWD;
+                        else if (strcmp(optarg, "proxy") == 0)
+                                muxclient_command = SSHMUX_COMMAND_PROXY;
                         else
                                 fatal("Invalid multiplex command.");
                         break;
@@ -685,11 +684,11 @@ main(int ac, char **av)
                         else if (strcmp(optarg, "kex") == 0)
                                 cp = kex_alg_list('\n');
                         else if (strcmp(optarg, "key") == 0)
-                                cp = key_alg_list(0, 0);
+                                cp = sshkey_alg_list(0, 0, '\n');
                         else if (strcmp(optarg, "key-cert") == 0)
-                                cp = key_alg_list(1, 0);
+                                cp = sshkey_alg_list(1, 0, '\n');
                         else if (strcmp(optarg, "key-plain") == 0)
-                                cp = key_alg_list(0, 1);
+                                cp = sshkey_alg_list(0, 1, '\n');
                         else if (strcmp(optarg, "protocol-version") == 0) {
 #ifdef WITH_SSH1
                                 cp = xstrdup("1\n2");
@@ -1162,7 +1161,8 @@ main(int ac, char **av)
                 tty_flag = options.request_tty != REQUEST_TTY_NO;
 
         /* Force no tty */
-        if (options.request_tty == REQUEST_TTY_NO || muxclient_command != 0)
+        if (options.request_tty == REQUEST_TTY_NO ||
+            (muxclient_command && muxclient_command != SSHMUX_COMMAND_PROXY))
                 tty_flag = 0;
         /* Do not allocate a tty if stdin is not a tty. */
         if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
@@ -1239,8 +1239,16 @@ main(int ac, char **av)
 
         if (muxclient_command != 0 && options.control_path == NULL)
                 fatal("No ControlPath specified for \"-O\" command");
-        if (options.control_path != NULL)
-                muxclient(options.control_path);
+        if (options.control_path != NULL) {
+                int sock;
+                if ((sock = muxclient(options.control_path)) >= 0) {
+                        packet_set_connection(sock, sock);
+                        ssh = active_state; /* XXX */
+                        enable_compat20();      /* XXX */
+                        packet_set_mux();
+                        goto skip_connect;
+                }
+        }
 
         /*
          * If hostname canonicalisation was not enabled, then we may not
@@ -1443,6 +1451,7 @@ main(int ac, char **av)
                 options.certificate_files[i] = NULL;
         }
 
+ skip_connect:
         exit_status = compat20 ? ssh_session2() : ssh_session();
         packet_close();
 
@@ -1953,7 +1962,8 @@ ssh_session2(void)
         ssh_init_forwarding();
 
         /* Start listening for multiplex clients */
-        muxserver_listen();
+        if (!packet_get_mux())
+                muxserver_listen();
 
         /*
          * If we are in control persist mode and have a working mux listen
@@ -2118,8 +2128,9 @@ load_public_identity_files(void)
                         free(cp);
                         continue;
                 }
+                /* NB. leave filename pointing to private key */
+                identity_files[n_ids] = xstrdup(filename);
                 identity_keys[n_ids] = public;
-                identity_files[n_ids] = cp;
                 n_ids++;
         }