]> andersk Git - openssh.git/blobdiff - ssh.c
- (tim) [configure.ac] set TEST_SHELL for OpenServer 6
[openssh.git] / ssh.c
diff --git a/ssh.c b/ssh.c
index 21ef4ec7495eb395ebf16ad0d7cb7ba6d2a76de9..43ecbd924a4727fc1bddadd0612d9822ed6b149d 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -2,58 +2,93 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * Created: Sat Mar 18 16:36:11 1995 ylo
  * Ssh client program.  This program can be used to log into a remote machine.
  * The software supports strong authentication, encryption, and forwarding
  * of X11, TCP/IP, and authentication connections.
  *
- * Modified to work with SSL by Niels Provos <provos@citi.umich.edu> in Canada.
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
+ * Copyright (c) 1999 Niels Provos.  All rights reserved.
+ * Copyright (c) 2000, 2001, 2002, 2003 Markus Friedl.  All rights reserved.
+ *
+ * Modified to work with SSL by Niels Provos <provos@citi.umich.edu>
+ * in Canada (German citizen).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: ssh.c,v 1.240 2005/05/27 08:30:37 djm Exp $");
 
 #include <openssl/evp.h>
-#include <openssl/dsa.h>
-#include <openssl/rsa.h>
+#include <openssl/err.h>
 
-#include "xmalloc.h"
 #include "ssh.h"
+#include "ssh1.h"
+#include "ssh2.h"
+#include "compat.h"
+#include "cipher.h"
+#include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
+#include "bufaux.h"
+#include "channels.h"
+#include "key.h"
 #include "authfd.h"
+#include "authfile.h"
+#include "pathnames.h"
+#include "dispatch.h"
+#include "clientloop.h"
+#include "log.h"
 #include "readconf.h"
+#include "sshconnect.h"
+#include "misc.h"
+#include "kex.h"
+#include "mac.h"
+#include "sshpty.h"
+#include "match.h"
+#include "msg.h"
+#include "monitor_fdpass.h"
 #include "uidswap.h"
 
-#include "ssh2.h"
-#include "compat.h"
-#include "channels.h"
-#include "key.h"
-#include "authfile.h"
+#ifdef SMARTCARD
+#include "scard.h"
+#endif
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "ssh";
-#endif /* HAVE___PROGNAME */
-
-/* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
-   Default value is AF_UNSPEC means both IPv4 and IPv6. */
-#ifdef IPV4_DEFAULT
-int IPv4or6 = AF_INET;
-#else
-int IPv4or6 = AF_UNSPEC;
-#endif
 
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
 
 /* Flag indicating whether a tty should be allocated */
 int tty_flag = 0;
+int no_tty_flag = 0;
+int force_tty_flag = 0;
 
 /* don't exec a shell */
 int no_shell_flag = 0;
-int no_tty_flag = 0;
 
 /*
  * Flag indicating that nothing should be read from stdin.  This can be set
@@ -63,7 +98,7 @@ int stdin_null_flag = 0;
 
 /*
  * Flag indicating that ssh should fork after authentication.  This is useful
- * so that the pasphrase can be entered manually, and then ssh goes to the
+ * so that the passphrase can be entered manually, and then ssh goes to the
  * background.
  */
 int fork_after_authentication_flag = 0;
@@ -74,6 +109,9 @@ int fork_after_authentication_flag = 0;
  */
 Options options;
 
+/* optional user configfile */
+char *config = NULL;
+
 /*
  * Name of the host we are connecting to.  This is the name given on the
  * command line, or the HostName specified for the user-supplied name in a
@@ -84,111 +122,55 @@ char *host;
 /* socket address the host resolves to */
 struct sockaddr_storage hostaddr;
 
-/*
- * Flag to indicate that we have received a window change signal which has
- * not yet been processed.  This will cause a message indicating the new
- * window size to be sent to the server a little later.  This is volatile
- * because this is updated in a signal handler.
- */
-volatile int received_window_change_signal = 0;
-
-/* Value of argv[0] (set in the main program). */
-char *av0;
-
-/* Flag indicating whether we have a valid host private key loaded. */
-int host_private_key_loaded = 0;
-
-/* Host private key. */
-RSA *host_private_key = NULL;
+/* Private host keys. */
+Sensitive sensitive_data;
 
 /* Original real UID. */
 uid_t original_real_uid;
+uid_t original_effective_uid;
 
 /* command to be executed */
 Buffer command;
 
-/* Prints a help message to the user.  This function never returns. */
+/* Should we execute a command or invoke a subsystem? */
+int subsystem_flag = 0;
 
-void
-usage()
-{
-       fprintf(stderr, "Usage: %s [options] host [command]\n", av0);
-       fprintf(stderr, "Options:\n");
-       fprintf(stderr, "  -l user     Log in using this user name.\n");
-       fprintf(stderr, "  -n          Redirect input from /dev/null.\n");
-       fprintf(stderr, "  -a          Disable authentication agent forwarding.\n");
-#ifdef AFS
-       fprintf(stderr, "  -k          Disable Kerberos ticket and AFS token forwarding.\n");
-#endif                         /* AFS */
-       fprintf(stderr, "  -x          Disable X11 connection forwarding.\n");
-       fprintf(stderr, "  -i file     Identity for RSA authentication (default: ~/.ssh/identity).\n");
-       fprintf(stderr, "  -t          Tty; allocate a tty even if command is given.\n");
-       fprintf(stderr, "  -T          Do not allocate a tty.\n");
-       fprintf(stderr, "  -v          Verbose; display verbose debugging messages.\n");
-       fprintf(stderr, "  -V          Display version number only.\n");
-       fprintf(stderr, "  -P          Don't allocate a privileged port.\n");
-       fprintf(stderr, "  -q          Quiet; don't display any warning messages.\n");
-       fprintf(stderr, "  -f          Fork into background after authentication.\n");
-       fprintf(stderr, "  -e char     Set escape character; ``none'' = disable (default: ~).\n");
-
-       fprintf(stderr, "  -c cipher   Select encryption algorithm: "
-                       "``3des'', "
-                       "``blowfish''\n");
-       fprintf(stderr, "  -p port     Connect to this port.  Server must be on the same port.\n");
-       fprintf(stderr, "  -L listen-port:host:port   Forward local port to remote address\n");
-       fprintf(stderr, "  -R listen-port:host:port   Forward remote port to local address\n");
-       fprintf(stderr, "              These cause %s to listen for connections on a port, and\n", av0);
-       fprintf(stderr, "              forward them to the other side by connecting to host:port.\n");
-       fprintf(stderr, "  -C          Enable compression.\n");
-       fprintf(stderr, "  -N          Do not execute a shell or command.\n");
-       fprintf(stderr, "  -g          Allow remote hosts to connect to forwarded ports.\n");
-       fprintf(stderr, "  -4          Use IPv4 only.\n");
-       fprintf(stderr, "  -6          Use IPv6 only.\n");
-       fprintf(stderr, "  -2          Force protocol version 2.\n");
-       fprintf(stderr, "  -o 'option' Process the option as if it was read from a configuration file.\n");
-       exit(1);
-}
+/* # of replies received for global requests */
+static int client_global_request_id = 0;
 
-/*
- * Connects to the given host using rsh (or prints an error message and exits
- * if rsh is not available).  This function never returns.
- */
-void
-rsh_connect(char *host, char *user, Buffer * command)
-{
-       char *args[10];
-       int i;
+/* pid of proxycommand child process */
+pid_t proxy_command_pid = 0;
 
-       log("Using rsh.  WARNING: Connection will not be encrypted.");
-       /* Build argument list for rsh. */
-       i = 0;
-       args[i++] = _PATH_RSH;
-       /* host may have to come after user on some systems */
-       args[i++] = host;
-       if (user) {
-               args[i++] = "-l";
-               args[i++] = user;
-       }
-       if (buffer_len(command) > 0) {
-               buffer_append(command, "\0", 1);
-               args[i++] = buffer_ptr(command);
-       }
-       args[i++] = NULL;
-       if (debug_flag) {
-               for (i = 0; args[i]; i++) {
-                       if (i != 0)
-                               fprintf(stderr, " ");
-                       fprintf(stderr, "%s", args[i]);
-               }
-               fprintf(stderr, "\n");
-       }
-       execv(_PATH_RSH, args);
-       perror(_PATH_RSH);
+/* fd to control socket */
+int control_fd = -1;
+
+/* Multiplexing control command */
+static u_int mux_command = 0;
+
+/* Only used in control client mode */
+volatile sig_atomic_t control_client_terminate = 0;
+u_int control_server_pid = 0;
+
+/* Prints a help message to the user.  This function never returns. */
+
+static void
+usage(void)
+{
+       fprintf(stderr,
+"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+"           [-D port] [-e escape_char] [-F configfile]\n"
+"           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
+"           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
+"           [-R [bind_address:]port:host:hostport] [-S ctl_path]\n"
+"           [user@]hostname [command]\n"
+       );
        exit(1);
 }
 
-int ssh_session(void);
-int ssh_session2(void);
+static int ssh_session(void);
+static int ssh_session2(void);
+static void load_public_identity_files(void);
+static void control_client(const char *path);
 
 /*
  * Main program for the ssh client.
@@ -196,13 +178,17 @@ int ssh_session2(void);
 int
 main(int ac, char **av)
 {
-       int i, opt, optind, exit_status, ok;
-       u_short fwd_port, fwd_host_port;
-       char *optarg, *cp, buf[256];
+       int i, opt, exit_status;
+       char *p, *cp, *line, buf[256];
        struct stat st;
-       struct passwd *pw, pwcopy;
+       struct passwd *pw;
        int dummy;
-       uid_t original_effective_uid;
+       extern int optind, optreset;
+       extern char *optarg;
+       Forward fwd;
+
+       __progname = ssh_get_progname(av[0]);
+       init_rng();
 
        /*
         * Save the original real uid.  It will be needed later (uid-swapping
@@ -211,13 +197,6 @@ main(int ac, char **av)
        original_real_uid = getuid();
        original_effective_uid = geteuid();
 
-       /* If we are installed setuid root be careful to not drop core. */
-       if (original_real_uid != original_effective_uid) {
-               struct rlimit rlim;
-               rlim.rlim_cur = rlim.rlim_max = 0;
-               if (setrlimit(RLIMIT_CORE, &rlim) < 0)
-                       fatal("setrlimit failed: %.100s", strerror(errno));
-       }
        /*
         * Use uid-swapping to give up root privileges for the duration of
         * option processing.  We will re-instantiate the rights when we are
@@ -225,7 +204,25 @@ main(int ac, char **av)
         * them when the port has been created (actually, when the connection
         * has been made, as we may need to create the port several times).
         */
-       temporarily_use_uid(original_real_uid);
+       PRIV_END;
+
+#ifdef HAVE_SETRLIMIT
+       /* If we are installed setuid root be careful to not drop core. */
+       if (original_real_uid != original_effective_uid) {
+               struct rlimit rlim;
+               rlim.rlim_cur = rlim.rlim_max = 0;
+               if (setrlimit(RLIMIT_CORE, &rlim) < 0)
+                       fatal("setrlimit failed: %.100s", strerror(errno));
+       }
+#endif
+       /* Get user data. */
+       pw = getpwuid(original_real_uid);
+       if (!pw) {
+               logit("You don't exist, go away!");
+               exit(1);
+       }
+       /* Take a copy of the returned structure. */
+       pw = pwcopy(pw);
 
        /*
         * Set our umask to something reasonable, as some files are created
@@ -235,62 +232,27 @@ main(int ac, char **av)
         */
        umask(022);
 
-       /* Save our own name. */
-       av0 = av[0];
-
        /* Initialize option structure to indicate that no values have been set. */
        initialize_options(&options);
 
        /* Parse command-line arguments. */
        host = NULL;
 
-       /* If program name is not one of the standard names, use it as host name. */
-       if (strchr(av0, '/'))
-               cp = strrchr(av0, '/') + 1;
-       else
-               cp = av0;
-       if (strcmp(cp, "rsh") != 0 && strcmp(cp, "ssh") != 0 &&
-           strcmp(cp, "rlogin") != 0 && strcmp(cp, "slogin") != 0)
-               host = cp;
-
-       for (optind = 1; optind < ac; optind++) {
-               if (av[optind][0] != '-') {
-                       if (host)
-                               break;
-                       if ((cp = strchr(av[optind], '@'))) {
-                               if(cp == av[optind])
-                                       usage();
-                               options.user = av[optind];
-                               *cp = '\0';
-                               host = ++cp;
-                       } else
-                               host = av[optind];
-                       continue;
-               }
-               opt = av[optind][1];
-               if (!opt)
-                       usage();
-               if (strchr("eilcpLRo", opt)) {  /* options with arguments */
-                       optarg = av[optind] + 2;
-                       if (strcmp(optarg, "") == 0) {
-                               if (optind >= ac - 1)
-                                       usage();
-                               optarg = av[++optind];
-                       }
-               } else {
-                       if (av[optind][2])
-                               usage();
-                       optarg = NULL;
-               }
+again:
+       while ((opt = getopt(ac, av,
+           "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVXY")) != -1) {
                switch (opt) {
+               case '1':
+                       options.protocol = SSH_PROTO_1;
+                       break;
                case '2':
                        options.protocol = SSH_PROTO_2;
                        break;
                case '4':
-                       IPv4or6 = AF_INET;
+                       options.address_family = AF_INET;
                        break;
                case '6':
-                       IPv4or6 = AF_INET6;
+                       options.address_family = AF_INET6;
                        break;
                case 'n':
                        stdin_null_flag = 1;
@@ -305,61 +267,90 @@ main(int ac, char **av)
                case 'X':
                        options.forward_x11 = 1;
                        break;
+               case 'Y':
+                       options.forward_x11 = 1;
+                       options.forward_x11_trusted = 1;
+                       break;
                case 'g':
                        options.gateway_ports = 1;
                        break;
-               case 'P':
+               case 'O':
+                       if (strcmp(optarg, "check") == 0)
+                               mux_command = SSHMUX_COMMAND_ALIVE_CHECK;
+                       else if (strcmp(optarg, "exit") == 0)
+                               mux_command = SSHMUX_COMMAND_TERMINATE;
+                       else
+                               fatal("Invalid multiplex command.");
+                       break;
+               case 'P':       /* deprecated */
                        options.use_privileged_port = 0;
                        break;
                case 'a':
                        options.forward_agent = 0;
                        break;
-#ifdef AFS
+               case 'A':
+                       options.forward_agent = 1;
+                       break;
                case 'k':
-                       options.kerberos_tgt_passing = 0;
-                       options.afs_token_passing = 0;
+                       options.gss_deleg_creds = 0;
                        break;
-#endif
                case 'i':
                        if (stat(optarg, &st) < 0) {
-                               fprintf(stderr, "Warning: Identity file %s does not exist.\n",
-                                       optarg);
+                               fprintf(stderr, "Warning: Identity file %s "
+                                   "not accessible: %s.\n", optarg,
+                                   strerror(errno));
                                break;
                        }
-                       if (options.num_identity_files >= SSH_MAX_IDENTITY_FILES)
-                               fatal("Too many identity files specified (max %d)",
-                                     SSH_MAX_IDENTITY_FILES);
+                       if (options.num_identity_files >=
+                           SSH_MAX_IDENTITY_FILES)
+                               fatal("Too many identity files specified "
+                                   "(max %d)", SSH_MAX_IDENTITY_FILES);
                        options.identity_files[options.num_identity_files++] =
-                               xstrdup(optarg);
+                           xstrdup(optarg);
+                       break;
+               case 'I':
+#ifdef SMARTCARD
+                       options.smartcard_device = xstrdup(optarg);
+#else
+                       fprintf(stderr, "no support for smartcards.\n");
+#endif
                        break;
                case 't':
+                       if (tty_flag)
+                               force_tty_flag = 1;
                        tty_flag = 1;
                        break;
                case 'v':
+                       if (debug_flag == 0) {
+                               debug_flag = 1;
+                               options.log_level = SYSLOG_LEVEL_DEBUG1;
+                       } else {
+                               if (options.log_level < SYSLOG_LEVEL_DEBUG3)
+                                       options.log_level++;
+                               break;
+                       }
+                       /* FALLTHROUGH */
                case 'V':
-                       fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n",
-                           SSH_VERSION,
-                           PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
-                           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2);
-                       fprintf(stderr, "Compiled with SSL (0x%8.8lx).\n", SSLeay());
+                       fprintf(stderr, "%s, %s\n",
+                           SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
                        if (opt == 'V')
                                exit(0);
-                       debug_flag = 1;
-                       options.log_level = SYSLOG_LEVEL_DEBUG;
                        break;
                case 'q':
                        options.log_level = SYSLOG_LEVEL_QUIET;
                        break;
                case 'e':
                        if (optarg[0] == '^' && optarg[2] == 0 &&
-                           (unsigned char) optarg[1] >= 64 && (unsigned char) optarg[1] < 128)
-                               options.escape_char = (unsigned char) optarg[1] & 31;
+                           (u_char) optarg[1] >= 64 &&
+                           (u_char) optarg[1] < 128)
+                               options.escape_char = (u_char) optarg[1] & 31;
                        else if (strlen(optarg) == 1)
-                               options.escape_char = (unsigned char) optarg[0];
+                               options.escape_char = (u_char) optarg[0];
                        else if (strcmp(optarg, "none") == 0)
-                               options.escape_char = -2;
+                               options.escape_char = SSH_ESCAPECHAR_NONE;
                        else {
-                               fprintf(stderr, "Bad escape character '%s'.\n", optarg);
+                               fprintf(stderr, "Bad escape character '%s'.\n",
+                                   optarg);
                                exit(1);
                        }
                        break;
@@ -367,43 +358,96 @@ main(int ac, char **av)
                        if (ciphers_valid(optarg)) {
                                /* SSH2 only */
                                options.ciphers = xstrdup(optarg);
+                               options.cipher = SSH_CIPHER_INVALID;
                        } else {
                                /* SSH1 only */
                                options.cipher = cipher_number(optarg);
                                if (options.cipher == -1) {
-                                       fprintf(stderr, "Unknown cipher type '%s'\n", optarg);
+                                       fprintf(stderr,
+                                           "Unknown cipher type '%s'\n",
+                                           optarg);
                                        exit(1);
                                }
+                               if (options.cipher == SSH_CIPHER_3DES)
+                                       options.ciphers = "3des-cbc";
+                               else if (options.cipher == SSH_CIPHER_BLOWFISH)
+                                       options.ciphers = "blowfish-cbc";
+                               else
+                                       options.ciphers = (char *)-1;
+                       }
+                       break;
+               case 'm':
+                       if (mac_valid(optarg))
+                               options.macs = xstrdup(optarg);
+                       else {
+                               fprintf(stderr, "Unknown mac type '%s'\n",
+                                   optarg);
+                               exit(1);
                        }
                        break;
+               case 'M':
+                       options.control_master =
+                           (options.control_master >= 1) ? 2 : 1;
+                       break;
                case 'p':
-                       options.port = atoi(optarg);
+                       options.port = a2port(optarg);
+                       if (options.port == 0) {
+                               fprintf(stderr, "Bad port '%s'\n", optarg);
+                               exit(1);
+                       }
                        break;
                case 'l':
                        options.user = optarg;
                        break;
+
+               case 'L':
+                       if (parse_forward(&fwd, optarg))
+                               add_local_forward(&options, &fwd);
+                       else {
+                               fprintf(stderr,
+                                   "Bad local forwarding specification '%s'\n",
+                                   optarg);
+                               exit(1);
+                       }
+                       break;
+
                case 'R':
-                       if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
-                           &fwd_host_port) != 3 &&
-                           sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf,
-                           &fwd_host_port) != 3) {
-                               fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg);
-                               usage();
-                               /* NOTREACHED */
+                       if (parse_forward(&fwd, optarg)) {
+                               add_remote_forward(&options, &fwd);
+                       } else {
+                               fprintf(stderr,
+                                   "Bad remote forwarding specification "
+                                   "'%s'\n", optarg);
+                               exit(1);
                        }
-                       add_remote_forward(&options, fwd_port, buf, fwd_host_port);
                        break;
-               case 'L':
-                       if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
-                           &fwd_host_port) != 3 &&
-                           sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf,
-                           &fwd_host_port) != 3) {
-                               fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg);
-                               usage();
-                               /* NOTREACHED */
+
+               case 'D':
+                       cp = p = xstrdup(optarg);
+                       memset(&fwd, '\0', sizeof(fwd));
+                       fwd.connect_host = "socks";
+                       if ((fwd.listen_host = hpdelim(&cp)) == NULL) {
+                               fprintf(stderr, "Bad dynamic forwarding "
+                                   "specification '%.100s'\n", optarg);
+                               exit(1);
+                       }
+                       if (cp != NULL) {
+                               fwd.listen_port = a2port(cp);
+                               fwd.listen_host = cleanhostname(fwd.listen_host);
+                       } else {
+                               fwd.listen_port = a2port(fwd.listen_host);
+                               fwd.listen_host = "";
+                       }
+
+                       if (fwd.listen_port == 0) {
+                               fprintf(stderr, "Bad dynamic port '%s'\n",
+                                   optarg);
+                               exit(1);
                        }
-                       add_local_forward(&options, fwd_port, buf, fwd_host_port);
+                       add_local_forward(&options, &fwd);
+                       xfree(p);
                        break;
+
                case 'C':
                        options.compression = 1;
                        break;
@@ -416,106 +460,136 @@ main(int ac, char **av)
                        break;
                case 'o':
                        dummy = 1;
-                       if (process_config_line(&options, host ? host : "", optarg,
-                                        "command-line", 0, &dummy) != 0)
+                       line = xstrdup(optarg);
+                       if (process_config_line(&options, host ? host : "",
+                           line, "command-line", 0, &dummy) != 0)
                                exit(1);
+                       xfree(line);
+                       break;
+               case 's':
+                       subsystem_flag = 1;
+                       break;
+               case 'S':
+                       if (options.control_path != NULL)
+                               free(options.control_path);
+                       options.control_path = xstrdup(optarg);
+                       break;
+               case 'b':
+                       options.bind_address = optarg;
+                       break;
+               case 'F':
+                       config = optarg;
                        break;
                default:
                        usage();
                }
        }
 
+       ac -= optind;
+       av += optind;
+
+       if (ac > 0 && !host && **av != '-') {
+               if (strrchr(*av, '@')) {
+                       p = xstrdup(*av);
+                       cp = strrchr(p, '@');
+                       if (cp == NULL || cp == p)
+                               usage();
+                       options.user = p;
+                       *cp = '\0';
+                       host = ++cp;
+               } else
+                       host = *av;
+               if (ac > 1) {
+                       optind = optreset = 1;
+                       goto again;
+               }
+               ac--, av++;
+       }
+
        /* Check that we got a host name. */
        if (!host)
                usage();
 
+       SSLeay_add_all_algorithms();
+       ERR_load_crypto_strings();
+
        /* Initialize the command to execute on remote host. */
        buffer_init(&command);
 
-       OpenSSL_add_all_algorithms();
-       
        /*
         * Save the command to execute on the remote host in a buffer. There
         * is no limit on the length of the command, except by the maximum
         * packet size.  Also sets the tty flag if there is no command.
         */
-       if (optind == ac) {
+       if (!ac) {
                /* No command specified - execute shell on a tty. */
                tty_flag = 1;
+               if (subsystem_flag) {
+                       fprintf(stderr,
+                           "You must specify a subsystem to invoke.\n");
+                       usage();
+               }
        } else {
-               /* A command has been specified.  Store it into the
-                  buffer. */
-               for (i = optind; i < ac; i++) {
-                       if (i > optind)
+               /* A command has been specified.  Store it into the buffer. */
+               for (i = 0; i < ac; i++) {
+                       if (i)
                                buffer_append(&command, " ", 1);
                        buffer_append(&command, av[i], strlen(av[i]));
                }
        }
 
        /* Cannot fork to background if no command. */
-       if (fork_after_authentication_flag && buffer_len(&command) == 0)
+       if (fork_after_authentication_flag && buffer_len(&command) == 0 && !no_shell_flag)
                fatal("Cannot fork into background without a command to execute.");
 
        /* Allocate a tty by default if no command specified. */
        if (buffer_len(&command) == 0)
                tty_flag = 1;
 
+       /* Force no tty */
+       if (no_tty_flag)
+               tty_flag = 0;
        /* Do not allocate a tty if stdin is not a tty. */
-       if (!isatty(fileno(stdin))) {
+       if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) {
                if (tty_flag)
-                       fprintf(stderr, "Pseudo-terminal will not be allocated because stdin is not a terminal.\n");
+                       logit("Pseudo-terminal will not be allocated because stdin is not a terminal.");
                tty_flag = 0;
        }
-       /* force */
-       if (no_tty_flag)
-               tty_flag = 0;
 
-       /* Get user data. */
-       pw = getpwuid(original_real_uid);
-       if (!pw) {
-               fprintf(stderr, "You don't exist, go away!\n");
-               exit(1);
+       /*
+        * Initialize "log" output.  Since we are the client all output
+        * actually goes to stderr.
+        */
+       log_init(av[0], options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
+           SYSLOG_FACILITY_USER, 1);
+
+       /*
+        * Read per-user configuration file.  Ignore the system wide config
+        * file if the user specifies a config file on the command line.
+        */
+       if (config != NULL) {
+               if (!read_config_file(config, host, &options, 0))
+                       fatal("Can't open user config file %.100s: "
+                           "%.100s", config, strerror(errno));
+       } else  {
+               snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
+                   _PATH_SSH_USER_CONFFILE);
+               (void)read_config_file(buf, host, &options, 1);
+
+               /* Read systemwide configuration file after use config. */
+               (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
+                   &options, 0);
        }
-       /* Take a copy of the returned structure. */
-       memset(&pwcopy, 0, sizeof(pwcopy));
-       pwcopy.pw_name = xstrdup(pw->pw_name);
-       pwcopy.pw_passwd = xstrdup(pw->pw_passwd);
-       pwcopy.pw_uid = pw->pw_uid;
-       pwcopy.pw_gid = pw->pw_gid;
-       pwcopy.pw_dir = xstrdup(pw->pw_dir);
-       pwcopy.pw_shell = xstrdup(pw->pw_shell);
-       pw = &pwcopy;
-
-       /* Initialize "log" output.  Since we are the client all output
-          actually goes to the terminal. */
-       log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0);
-
-       /* Read per-user configuration file. */
-       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_CONFFILE);
-       read_config_file(buf, host, &options);
-
-       /* Read systemwide configuration file. */
-       read_config_file(HOST_CONFIG_FILE, host, &options);
 
        /* Fill configuration defaults. */
        fill_default_options(&options);
 
+       channel_set_af(options.address_family);
+
        /* reinit */
-       log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0);
+       log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 1);
 
-       /* check if RSA support exists */
-       if ((options.protocol & SSH_PROTO_1) &&
-           rsa_alive() == 0) {
-               log("%s: no RSA support in libssl and libcrypto.  See ssl(8).",
-                   __progname);
-               log("Disabling protocol version 1");
-               options.protocol &= ~ (SSH_PROTO_1|SSH_PROTO_1_PREFERRED);
-       }
-       if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) {
-               fprintf(stderr, "%s: No protocol version available.\n",
-                   __progname);
-               exit(1);
-       }
+       seed_rng();
 
        if (options.user == NULL)
                options.user = xstrdup(pw->pw_name);
@@ -523,73 +597,76 @@ main(int ac, char **av)
        if (options.hostname != NULL)
                host = options.hostname;
 
-       /* Find canonic host name. */
-       if (strchr(host, '.') == 0) {
-               struct addrinfo hints;
-               struct addrinfo *ai = NULL;
-               int errgai;
-               memset(&hints, 0, sizeof(hints));
-               hints.ai_family = IPv4or6;
-               hints.ai_flags = AI_CANONNAME;
-               hints.ai_socktype = SOCK_STREAM;
-               errgai = getaddrinfo(host, NULL, &hints, &ai);
-               if (errgai == 0) {
-                       if (ai->ai_canonname != NULL)
-                               host = xstrdup(ai->ai_canonname);
-                       freeaddrinfo(ai);
-               }
+       /* force lowercase for hostkey matching */
+       if (options.host_key_alias != NULL) {
+               for (p = options.host_key_alias; *p; p++)
+                       if (isupper(*p))
+                               *p = tolower(*p);
        }
-       /* Disable rhosts authentication if not running as root. */
-       if (original_effective_uid != 0 || !options.use_privileged_port) {
-               options.rhosts_authentication = 0;
-               options.rhosts_rsa_authentication = 0;
-       }
-       /*
-        * If using rsh has been selected, exec it now (without trying
-        * anything else).  Note that we must release privileges first.
-        */
-       if (options.use_rsh) {
-               /*
-                * Restore our superuser privileges.  This must be done
-                * before permanently setting the uid.
-                */
-               restore_uid();
 
-               /* Switch to the original uid permanently. */
-               permanently_set_uid(original_real_uid);
+       if (options.proxy_command != NULL &&
+           strcmp(options.proxy_command, "none") == 0)
+               options.proxy_command = NULL;
 
-               /* Execute rsh. */
-               rsh_connect(host, options.user, &command);
-               fatal("rsh_connect returned");
+       if (options.control_path != NULL) {
+               options.control_path = tilde_expand_filename(
+                  options.control_path, original_real_uid);
+       }
+       if (mux_command != 0 && options.control_path == NULL)
+               fatal("No ControlPath specified for \"-O\" command");
+       if (options.control_path != NULL && options.control_master == 0) {
+               if (mux_command == 0)
+                       mux_command = SSHMUX_COMMAND_OPEN;
+               control_client(options.control_path);
        }
-       /* Restore our superuser privileges. */
-       restore_uid();
-
-       /*
-        * Open a connection to the remote host.  This needs root privileges
-        * if rhosts_{rsa_}authentication is enabled.
-        */
 
-       ok = ssh_connect(host, &hostaddr, options.port,
-                        options.connection_attempts,
-                        !options.rhosts_authentication &&
-                        !options.rhosts_rsa_authentication,
-                        original_real_uid,
-                        options.proxy_command);
+       /* Open a connection to the remote host. */
+       if (ssh_connect(host, &hostaddr, options.port,
+           options.address_family, options.connection_attempts,
+#ifdef HAVE_CYGWIN
+           options.use_privileged_port,
+#else
+           original_effective_uid == 0 && options.use_privileged_port,
+#endif
+           options.proxy_command) != 0)
+               exit(1);
 
        /*
         * If we successfully made the connection, load the host private key
         * in case we will need it later for combined rsa-rhosts
         * authentication. This must be done before releasing extra
         * privileges, because the file is only readable by root.
+        * If we cannot access the private keys, load the public keys
+        * instead and try to execute the ssh-keysign helper instead.
         */
-       if (ok && (options.protocol & SSH_PROTO_1)) {
-               Key k;
-               host_private_key = RSA_new();
-               k.type = KEY_RSA;
-               k.rsa = host_private_key;
-               if (load_private_key(HOST_KEY_FILE, "", &k, NULL))
-                       host_private_key_loaded = 1;
+       sensitive_data.nkeys = 0;
+       sensitive_data.keys = NULL;
+       sensitive_data.external_keysign = 0;
+       if (options.rhosts_rsa_authentication ||
+           options.hostbased_authentication) {
+               sensitive_data.nkeys = 3;
+               sensitive_data.keys = xmalloc(sensitive_data.nkeys *
+                   sizeof(Key));
+
+               PRIV_START;
+               sensitive_data.keys[0] = key_load_private_type(KEY_RSA1,
+                   _PATH_HOST_KEY_FILE, "", NULL);
+               sensitive_data.keys[1] = key_load_private_type(KEY_DSA,
+                   _PATH_HOST_DSA_KEY_FILE, "", NULL);
+               sensitive_data.keys[2] = key_load_private_type(KEY_RSA,
+                   _PATH_HOST_RSA_KEY_FILE, "", NULL);
+               PRIV_END;
+
+               if (options.hostbased_authentication == 1 &&
+                   sensitive_data.keys[0] == NULL &&
+                   sensitive_data.keys[1] == NULL &&
+                   sensitive_data.keys[2] == NULL) {
+                       sensitive_data.keys[1] = key_load_public(
+                           _PATH_HOST_DSA_KEY_FILE, NULL);
+                       sensitive_data.keys[2] = key_load_public(
+                           _PATH_HOST_RSA_KEY_FILE, NULL);
+                       sensitive_data.external_keysign = 1;
+               }
        }
        /*
         * Get rid of any extra privileges that we may have.  We will no
@@ -598,90 +675,158 @@ main(int ac, char **av)
         * user's home directory if it happens to be on a NFS volume where
         * root is mapped to nobody.
         */
-
-       /*
-        * Note that some legacy systems need to postpone the following call
-        * to permanently_set_uid() until the private hostkey is destroyed
-        * with RSA_free().  Otherwise the calling user could ptrace() the
-        * process, read the private hostkey and impersonate the host.
-        * OpenBSD does not allow ptracing of setuid processes.
-        */
-       permanently_set_uid(original_real_uid);
+       if (original_effective_uid == 0) {
+               PRIV_START;
+               permanently_set_uid(pw);
+       }
 
        /*
         * Now that we are back to our own permissions, create ~/.ssh
         * directory if it doesn\'t already exist.
         */
-       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_DIR);
+       snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
        if (stat(buf, &st) < 0)
-               if (mkdir(buf, 0755) < 0)
+               if (mkdir(buf, 0700) < 0)
                        error("Could not create directory '%.200s'.", buf);
 
-       /* Check if the connection failed, and try "rsh" if appropriate. */
-       if (!ok) {
-               if (options.port != 0)
-                       log("Secure connection to %.100s on port %hu refused%.100s.",
-                           host, options.port,
-                           options.fallback_to_rsh ? "; reverting to insecure method" : "");
-               else
-                       log("Secure connection to %.100s refused%.100s.", host,
-                           options.fallback_to_rsh ? "; reverting to insecure method" : "");
+       /* load options.identity_files */
+       load_public_identity_files();
 
-               if (options.fallback_to_rsh) {
-                       rsh_connect(host, options.user, &command);
-                       fatal("rsh_connect returned");
-               }
-               exit(1);
-       }
-       /* Expand ~ in options.identity_files. */
-       /* XXX mem-leaks */
-       for (i = 0; i < options.num_identity_files; i++)
-               options.identity_files[i] =
-                       tilde_expand_filename(options.identity_files[i], original_real_uid);
-       for (i = 0; i < options.num_identity_files2; i++)
-               options.identity_files2[i] =
-                       tilde_expand_filename(options.identity_files2[i], original_real_uid);
        /* Expand ~ in known host file names. */
-       options.system_hostfile = tilde_expand_filename(options.system_hostfile,
-           original_real_uid);
-       options.user_hostfile = tilde_expand_filename(options.user_hostfile,
-           original_real_uid);
-       options.system_hostfile2 = tilde_expand_filename(options.system_hostfile2,
-           original_real_uid);
-       options.user_hostfile2 = tilde_expand_filename(options.user_hostfile2,
-           original_real_uid);
+       /* XXX mem-leaks: */
+       options.system_hostfile =
+           tilde_expand_filename(options.system_hostfile, original_real_uid);
+       options.user_hostfile =
+           tilde_expand_filename(options.user_hostfile, original_real_uid);
+       options.system_hostfile2 =
+           tilde_expand_filename(options.system_hostfile2, original_real_uid);
+       options.user_hostfile2 =
+           tilde_expand_filename(options.user_hostfile2, original_real_uid);
+
+       signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
 
        /* Log into the remote system.  This never returns if the login fails. */
-       ssh_login(host_private_key_loaded, host_private_key,
-                 host, (struct sockaddr *)&hostaddr, original_real_uid);
-
-       /* We no longer need the host private key.  Clear it now. */
-       if (host_private_key_loaded)
-               RSA_free(host_private_key);     /* Destroys contents safely */
+       ssh_login(&sensitive_data, host, (struct sockaddr *)&hostaddr, pw);
+
+       /* We no longer need the private host keys.  Clear them now. */
+       if (sensitive_data.nkeys != 0) {
+               for (i = 0; i < sensitive_data.nkeys; i++) {
+                       if (sensitive_data.keys[i] != NULL) {
+                               /* Destroys contents safely */
+                               debug3("clear hostkey %d", i);
+                               key_free(sensitive_data.keys[i]);
+                               sensitive_data.keys[i] = NULL;
+                       }
+               }
+               xfree(sensitive_data.keys);
+       }
+       for (i = 0; i < options.num_identity_files; i++) {
+               if (options.identity_files[i]) {
+                       xfree(options.identity_files[i]);
+                       options.identity_files[i] = NULL;
+               }
+               if (options.identity_keys[i]) {
+                       key_free(options.identity_keys[i]);
+                       options.identity_keys[i] = NULL;
+               }
+       }
 
        exit_status = compat20 ? ssh_session2() : ssh_session();
        packet_close();
+
+       if (options.control_path != NULL && control_fd != -1)
+               unlink(options.control_path);
+
+       /*
+        * Send SIGHUP to proxy command if used. We don't wait() in
+        * case it hangs and instead rely on init to reap the child
+        */
+       if (proxy_command_pid > 1)
+               kill(proxy_command_pid, SIGHUP);
+
        return exit_status;
 }
 
-void
-x11_get_proto(char *proto, int proto_len, char *data, int data_len)
+#define SSH_X11_PROTO "MIT-MAGIC-COOKIE-1"
+
+static void
+x11_get_proto(char **_proto, char **_data)
 {
+       char cmd[1024];
        char line[512];
+       char xdisplay[512];
+       static char proto[512], data[512];
        FILE *f;
-       int got_data = 0, i;
-
-#ifdef XAUTH_PATH
-       /* Try to get Xauthority information for the display. */
-       snprintf(line, sizeof line, "%.100s list %.200s 2>/dev/null",
-                XAUTH_PATH, getenv("DISPLAY"));
-       f = popen(line, "r");
-       if (f && fgets(line, sizeof(line), f) &&
-           sscanf(line, "%*s %s %s", proto, data) == 2)
-               got_data = 1;
-       if (f)
-               pclose(f);
-#endif /* XAUTH_PATH */
+       int got_data = 0, generated = 0, do_unlink = 0, i;
+       char *display, *xauthdir, *xauthfile;
+       struct stat st;
+
+       xauthdir = xauthfile = NULL;
+       *_proto = proto;
+       *_data = data;
+       proto[0] = data[0] = '\0';
+
+       if (!options.xauth_location ||
+           (stat(options.xauth_location, &st) == -1)) {
+               debug("No xauth program.");
+       } else {
+               if ((display = getenv("DISPLAY")) == NULL) {
+                       debug("x11_get_proto: DISPLAY not set");
+                       return;
+               }
+               /*
+                * Handle FamilyLocal case where $DISPLAY does
+                * not match an authorization entry.  For this we
+                * just try "xauth list unix:displaynum.screennum".
+                * XXX: "localhost" match to determine FamilyLocal
+                *      is not perfect.
+                */
+               if (strncmp(display, "localhost:", 10) == 0) {
+                       snprintf(xdisplay, sizeof(xdisplay), "unix:%s",
+                           display + 10);
+                       display = xdisplay;
+               }
+               if (options.forward_x11_trusted == 0) {
+                       xauthdir = xmalloc(MAXPATHLEN);
+                       xauthfile = xmalloc(MAXPATHLEN);
+                       strlcpy(xauthdir, "/tmp/ssh-XXXXXXXXXX", MAXPATHLEN);
+                       if (mkdtemp(xauthdir) != NULL) {
+                               do_unlink = 1;
+                               snprintf(xauthfile, MAXPATHLEN, "%s/xauthfile",
+                                   xauthdir);
+                               snprintf(cmd, sizeof(cmd),
+                                   "%s -f %s generate %s " SSH_X11_PROTO
+                                   " untrusted timeout 1200 2>" _PATH_DEVNULL,
+                                   options.xauth_location, xauthfile, display);
+                               debug2("x11_get_proto: %s", cmd);
+                               if (system(cmd) == 0)
+                                       generated = 1;
+                       }
+               }
+               snprintf(cmd, sizeof(cmd),
+                   "%s %s%s list %s . 2>" _PATH_DEVNULL,
+                   options.xauth_location,
+                   generated ? "-f " : "" ,
+                   generated ? xauthfile : "",
+                   display);
+               debug2("x11_get_proto: %s", cmd);
+               f = popen(cmd, "r");
+               if (f && fgets(line, sizeof(line), f) &&
+                   sscanf(line, "%*s %511s %511s", proto, data) == 2)
+                       got_data = 1;
+               if (f)
+                       pclose(f);
+       }
+
+       if (do_unlink) {
+               unlink(xauthfile);
+               rmdir(xauthdir);
+       }
+       if (xauthdir)
+               xfree(xauthdir);
+       if (xauthfile)
+               xfree(xauthfile);
+
        /*
         * If we didn't get authentication data, just make up some
         * data.  The forwarding code will check the validity of the
@@ -691,28 +836,82 @@ x11_get_proto(char *proto, int proto_len, char *data, int data_len)
         * for the local connection.
         */
        if (!got_data) {
-               u_int32_t rand = 0;
+               u_int32_t rnd = 0;
 
-               strlcpy(proto, "MIT-MAGIC-COOKIE-1", proto_len);
+               logit("Warning: No xauth data; "
+                   "using fake authentication data for X11 forwarding.");
+               strlcpy(proto, SSH_X11_PROTO, sizeof proto);
                for (i = 0; i < 16; i++) {
                        if (i % 4 == 0)
-                               rand = arc4random();
-                       snprintf(data + 2 * i, data_len - 2 * i, "%02x", rand & 0xff);
-                       rand >>= 8;
+                               rnd = arc4random();
+                       snprintf(data + 2 * i, sizeof data - 2 * i, "%02x",
+                           rnd & 0xff);
+                       rnd >>= 8;
                }
        }
 }
 
-int
+static void
+ssh_init_forwarding(void)
+{
+       int success = 0;
+       int i;
+
+       /* Initiate local TCP/IP port forwardings. */
+       for (i = 0; i < options.num_local_forwards; i++) {
+               debug("Local connections to %.200s:%d forwarded to remote "
+                   "address %.200s:%d",
+                   (options.local_forwards[i].listen_host == NULL) ?
+                   (options.gateway_ports ? "*" : "LOCALHOST") :
+                   options.local_forwards[i].listen_host,
+                   options.local_forwards[i].listen_port,
+                   options.local_forwards[i].connect_host,
+                   options.local_forwards[i].connect_port);
+               success += channel_setup_local_fwd_listener(
+                   options.local_forwards[i].listen_host,
+                   options.local_forwards[i].listen_port,
+                   options.local_forwards[i].connect_host,
+                   options.local_forwards[i].connect_port,
+                   options.gateway_ports);
+       }
+       if (i > 0 && success == 0)
+               error("Could not request local forwarding.");
+
+       /* Initiate remote TCP/IP port forwardings. */
+       for (i = 0; i < options.num_remote_forwards; i++) {
+               debug("Remote connections from %.200s:%d forwarded to "
+                   "local address %.200s:%d",
+                   (options.remote_forwards[i].listen_host == NULL) ? 
+                   (options.gateway_ports ? "*" : "LOCALHOST") : 
+                   options.remote_forwards[i].listen_host,
+                   options.remote_forwards[i].listen_port,
+                   options.remote_forwards[i].connect_host,
+                   options.remote_forwards[i].connect_port);
+               channel_request_remote_forwarding(
+                   options.remote_forwards[i].listen_host,
+                   options.remote_forwards[i].listen_port,
+                   options.remote_forwards[i].connect_host,
+                   options.remote_forwards[i].connect_port);
+       }
+}
+
+static void
+check_agent_present(void)
+{
+       if (options.forward_agent) {
+               /* Clear agent forwarding if we don\'t have an agent. */
+               if (!ssh_agent_present())
+                       options.forward_agent = 0;
+       }
+}
+
+static int
 ssh_session(void)
 {
        int type;
-       int i;
-       int plen;
        int interactive = 0;
        int have_tty = 0;
        struct winsize ws;
-       int authfd;
        char *cp;
 
        /* Enable compression if requested. */
@@ -727,11 +926,11 @@ ssh_session(void)
                packet_put_int(options.compression_level);
                packet_send();
                packet_write_wait();
-               type = packet_read(&plen);
+               type = packet_read();
                if (type == SSH_SMSG_SUCCESS)
                        packet_start_compression(options.compression_level);
                else if (type == SSH_SMSG_FAILURE)
-                       log("Warning: Remote host refused compression.");
+                       logit("Warning: Remote host refused compression.");
                else
                        packet_disconnect("Protocol error waiting for compression response.");
        }
@@ -747,7 +946,7 @@ ssh_session(void)
                cp = getenv("TERM");
                if (!cp)
                        cp = "";
-               packet_put_string(cp, strlen(cp));
+               packet_put_cstring(cp);
 
                /* Store window size in the packet. */
                if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)
@@ -758,84 +957,60 @@ ssh_session(void)
                packet_put_int(ws.ws_ypixel);
 
                /* Store tty modes in the packet. */
-               tty_make_modes(fileno(stdin));
+               tty_make_modes(fileno(stdin), NULL);
 
                /* Send the packet, and wait for it to leave. */
                packet_send();
                packet_write_wait();
 
                /* Read response from the server. */
-               type = packet_read(&plen);
+               type = packet_read();
                if (type == SSH_SMSG_SUCCESS) {
                        interactive = 1;
                        have_tty = 1;
                } else if (type == SSH_SMSG_FAILURE)
-                       log("Warning: Remote host failed or refused to allocate a pseudo tty.");
+                       logit("Warning: Remote host failed or refused to allocate a pseudo tty.");
                else
                        packet_disconnect("Protocol error waiting for pty request response.");
        }
        /* Request X11 forwarding if enabled and DISPLAY is set. */
        if (options.forward_x11 && getenv("DISPLAY") != NULL) {
-               char proto[512], data[512];
+               char *proto, *data;
                /* Get reasonable local authentication information. */
-               x11_get_proto(proto, sizeof proto, data, sizeof data);
+               x11_get_proto(&proto, &data);
                /* Request forwarding with authentication spoofing. */
                debug("Requesting X11 forwarding with authentication spoofing.");
                x11_request_forwarding_with_spoofing(0, proto, data);
 
                /* Read response from the server. */
-               type = packet_read(&plen);
+               type = packet_read();
                if (type == SSH_SMSG_SUCCESS) {
                        interactive = 1;
                } else if (type == SSH_SMSG_FAILURE) {
-                       log("Warning: Remote host denied X11 forwarding.");
+                       logit("Warning: Remote host denied X11 forwarding.");
                } else {
                        packet_disconnect("Protocol error waiting for X11 forwarding");
                }
        }
        /* Tell the packet module whether this is an interactive session. */
-       packet_set_interactive(interactive, options.keepalives);
-
-       /* Clear agent forwarding if we don\'t have an agent. */
-       authfd = ssh_get_authentication_socket();
-       if (authfd < 0)
-               options.forward_agent = 0;
-       else
-               ssh_close_authentication_socket(authfd);
+       packet_set_interactive(interactive);
 
        /* Request authentication agent forwarding if appropriate. */
+       check_agent_present();
+
        if (options.forward_agent) {
                debug("Requesting authentication agent forwarding.");
                auth_request_forwarding();
 
                /* Read response from the server. */
-               type = packet_read(&plen);
-               packet_integrity_check(plen, 0, type);
+               type = packet_read();
+               packet_check_eom();
                if (type != SSH_SMSG_SUCCESS)
-                       log("Warning: Remote host denied authentication agent forwarding.");
-       }
-       /* Initiate local TCP/IP port forwardings. */
-       for (i = 0; i < options.num_local_forwards; i++) {
-               debug("Connections to local port %d forwarded to remote address %.200s:%d",
-                     options.local_forwards[i].port,
-                     options.local_forwards[i].host,
-                     options.local_forwards[i].host_port);
-               channel_request_local_forwarding(options.local_forwards[i].port,
-                                                options.local_forwards[i].host,
-                                                options.local_forwards[i].host_port,
-                                                options.gateway_ports);
+                       logit("Warning: Remote host denied authentication agent forwarding.");
        }
 
-       /* Initiate remote TCP/IP port forwardings. */
-       for (i = 0; i < options.num_remote_forwards; i++) {
-               debug("Connections to remote port %d forwarded to local address %.200s:%d",
-                     options.remote_forwards[i].port,
-                     options.remote_forwards[i].host,
-                     options.remote_forwards[i].host_port);
-               channel_request_remote_forwarding(options.remote_forwards[i].port,
-                                                 options.remote_forwards[i].host,
-                                                 options.remote_forwards[i].host_port);
-       }
+       /* Initiate port forwardings. */
+       ssh_init_forwarding();
 
        /* If requested, let ssh continue in the background. */
        if (fork_after_authentication_flag)
@@ -850,7 +1025,7 @@ ssh_session(void)
                int len = buffer_len(&command);
                if (len > 900)
                        len = 900;
-               debug("Sending command: %.*s", len, buffer_ptr(&command));
+               debug("Sending command: %.*s", len, (u_char *)buffer_ptr(&command));
                packet_start(SSH_CMSG_EXEC_CMD);
                packet_put_string(buffer_ptr(&command), buffer_len(&command));
                packet_send();
@@ -863,114 +1038,412 @@ ssh_session(void)
        }
 
        /* Enter the interactive session. */
-       return client_loop(have_tty, tty_flag ? options.escape_char : -1);
+       return client_loop(have_tty, tty_flag ?
+           options.escape_char : SSH_ESCAPECHAR_NONE, 0);
+}
+
+static void
+ssh_subsystem_reply(int type, u_int32_t seq, void *ctxt)
+{
+       int id, len;
+
+       id = packet_get_int();
+       len = buffer_len(&command);
+       if (len > 900)
+               len = 900;
+       packet_check_eom();
+       if (type == SSH2_MSG_CHANNEL_FAILURE)
+               fatal("Request for subsystem '%.*s' failed on channel %d",
+                   len, (u_char *)buffer_ptr(&command), id);
 }
 
 void
-init_local_fwd(void)
+client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt)
 {
        int i;
-       /* Initiate local TCP/IP port forwardings. */
-       for (i = 0; i < options.num_local_forwards; i++) {
-               debug("Connections to local port %d forwarded to remote address %.200s:%d",
-                     options.local_forwards[i].port,
-                     options.local_forwards[i].host,
-                     options.local_forwards[i].host_port);
-               channel_request_local_forwarding(options.local_forwards[i].port,
-                                                options.local_forwards[i].host,
-                                                options.local_forwards[i].host_port,
-                                                options.gateway_ports);
-       }
-}
 
-extern void client_set_session_ident(int id);
+       i = client_global_request_id++;
+       if (i >= options.num_remote_forwards)
+               return;
+       debug("remote forward %s for: listen %d, connect %s:%d",
+           type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure",
+           options.remote_forwards[i].listen_port,
+           options.remote_forwards[i].connect_host,
+           options.remote_forwards[i].connect_port);
+       if (type == SSH2_MSG_REQUEST_FAILURE)
+               logit("Warning: remote port forwarding failed for listen "
+                   "port %d", options.remote_forwards[i].listen_port);
+}
 
-void
-client_init(int id, void *arg)
+static void
+ssh_control_listener(void)
 {
-       int len;
-       debug("client_init id %d arg %d", id, (int)arg);
+       struct sockaddr_un addr;
+       mode_t old_umask;
+       int addr_len;
+
+       if (options.control_path == NULL || options.control_master <= 0)
+               return;
+
+       memset(&addr, '\0', sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       addr_len = offsetof(struct sockaddr_un, sun_path) +
+           strlen(options.control_path) + 1;
+
+       if (strlcpy(addr.sun_path, options.control_path,
+           sizeof(addr.sun_path)) >= sizeof(addr.sun_path))
+               fatal("ControlPath too long");
+
+       if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+               fatal("%s socket(): %s\n", __func__, strerror(errno));
+
+       old_umask = umask(0177);
+       if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
+               control_fd = -1;
+               if (errno == EINVAL || errno == EADDRINUSE)
+                       fatal("ControlSocket %s already exists",
+                           options.control_path);
+               else
+                       fatal("%s bind(): %s\n", __func__, strerror(errno));
+       }
+       umask(old_umask);
 
-       if (no_shell_flag)
-               goto done;
+       if (listen(control_fd, 64) == -1)
+               fatal("%s listen(): %s\n", __func__, strerror(errno));
 
-       if (tty_flag) {
-               struct winsize ws;
-               char *cp;
-               cp = getenv("TERM");
-               if (!cp)
-                       cp = "";
-               /* Store window size in the packet. */
-               if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)
-                       memset(&ws, 0, sizeof(ws));
+       set_nonblock(control_fd);
+}
 
-               channel_request_start(id, "pty-req", 0);
-               packet_put_cstring(cp);
-               packet_put_int(ws.ws_col);
-               packet_put_int(ws.ws_row);
-               packet_put_int(ws.ws_xpixel);
-               packet_put_int(ws.ws_ypixel);
-               packet_put_cstring("");         /* XXX: encode terminal modes */
-               packet_send();
-               /* XXX wait for reply */
-       }
-       if (options.forward_x11 &&
-           getenv("DISPLAY") != NULL) {
-               char proto[512], data[512];
+/* request pty/x11/agent/tcpfwd/shell for channel */
+static void
+ssh_session2_setup(int id, void *arg)
+{
+       extern char **environ;
+
+       int interactive = tty_flag;
+       if (options.forward_x11 && getenv("DISPLAY") != NULL) {
+               char *proto, *data;
                /* Get reasonable local authentication information. */
-               x11_get_proto(proto, sizeof proto, data, sizeof data);
+               x11_get_proto(&proto, &data);
                /* Request forwarding with authentication spoofing. */
                debug("Requesting X11 forwarding with authentication spoofing.");
                x11_request_forwarding_with_spoofing(id, proto, data);
+               interactive = 1;
                /* XXX wait for reply */
        }
 
-       len = buffer_len(&command);
-       if (len > 0) {
-               if (len > 900)
-                       len = 900;
-               debug("Sending command: %.*s", len, buffer_ptr(&command));
-               channel_request_start(id, "exec", 0);
-               packet_put_string(buffer_ptr(&command), len);
+       check_agent_present();
+       if (options.forward_agent) {
+               debug("Requesting authentication agent forwarding.");
+               channel_request_start(id, "auth-agent-req@openssh.com", 0);
                packet_send();
+       }
+
+       client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"),
+           NULL, fileno(stdin), &command, environ, &ssh_subsystem_reply);
+
+       packet_set_interactive(interactive);
+}
+
+/* open new channel for a session */
+static int
+ssh_session2_open(void)
+{
+       Channel *c;
+       int window, packetmax, in, out, err;
+
+       if (stdin_null_flag) {
+               in = open(_PATH_DEVNULL, O_RDONLY);
        } else {
-               channel_request(id, "shell", 0);
+               in = dup(STDIN_FILENO);
+       }
+       out = dup(STDOUT_FILENO);
+       err = dup(STDERR_FILENO);
+
+       if (in < 0 || out < 0 || err < 0)
+               fatal("dup() in/out/err failed");
+
+       /* enable nonblocking unless tty */
+       if (!isatty(in))
+               set_nonblock(in);
+       if (!isatty(out))
+               set_nonblock(out);
+       if (!isatty(err))
+               set_nonblock(err);
+
+       window = CHAN_SES_WINDOW_DEFAULT;
+       packetmax = CHAN_SES_PACKET_DEFAULT;
+       if (tty_flag) {
+               window >>= 1;
+               packetmax >>= 1;
        }
-       /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */
-done:
-       /* register different callback, etc. XXX */
-       client_set_session_ident(id);
+       c = channel_new(
+           "session", SSH_CHANNEL_OPENING, in, out, err,
+           window, packetmax, CHAN_EXTENDED_WRITE,
+           "client-session", /*nonblock*/0);
+
+       debug3("ssh_session2_open: channel_new: %d", c->self);
+
+       channel_send_open(c->self);
+       if (!no_shell_flag)
+               channel_register_confirm(c->self, ssh_session2_setup, NULL);
+
+       return c->self;
 }
 
-int
+static int
 ssh_session2(void)
 {
-       int window, packetmax, id;
-       int in  = dup(STDIN_FILENO);
-       int out = dup(STDOUT_FILENO);
-       int err = dup(STDERR_FILENO);
+       int id = -1;
 
-       if (in < 0 || out < 0 || err < 0)
-               fatal("dump in/out/err failed");
+       /* XXX should be pre-session */
+       ssh_init_forwarding();
+       ssh_control_listener();
 
-       /* should be pre-session */
-       init_local_fwd();
-       
-       window = 32*1024;
-       if (tty_flag) {
-               packetmax = window/8;
+       if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
+               id = ssh_session2_open();
+
+       /* If requested, let ssh continue in the background. */
+       if (fork_after_authentication_flag)
+               if (daemon(1, 1) < 0)
+                       fatal("daemon() failed: %.200s", strerror(errno));
+
+       return client_loop(tty_flag, tty_flag ?
+           options.escape_char : SSH_ESCAPECHAR_NONE, id);
+}
+
+static void
+load_public_identity_files(void)
+{
+       char *filename;
+       int i = 0;
+       Key *public;
+#ifdef SMARTCARD
+       Key **keys;
+
+       if (options.smartcard_device != NULL &&
+           options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+           (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) {
+               int count = 0;
+               for (i = 0; keys[i] != NULL; i++) {
+                       count++;
+                       memmove(&options.identity_files[1], &options.identity_files[0],
+                           sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
+                       memmove(&options.identity_keys[1], &options.identity_keys[0],
+                           sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
+                       options.num_identity_files++;
+                       options.identity_keys[0] = keys[i];
+                       options.identity_files[0] = sc_get_key_label(keys[i]);
+               }
+               if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
+                       options.num_identity_files = SSH_MAX_IDENTITY_FILES;
+               i = count;
+               xfree(keys);
+       }
+#endif /* SMARTCARD */
+       for (; i < options.num_identity_files; i++) {
+               filename = tilde_expand_filename(options.identity_files[i],
+                   original_real_uid);
+               public = key_load_public(filename, NULL);
+               debug("identity file %s type %d", filename,
+                   public ? public->type : -1);
+               xfree(options.identity_files[i]);
+               options.identity_files[i] = filename;
+               options.identity_keys[i] = public;
+       }
+}
+
+static void
+control_client_sighandler(int signo)
+{
+       control_client_terminate = signo;
+}
+
+static void
+control_client_sigrelay(int signo)
+{
+       if (control_server_pid > 1)
+               kill(control_server_pid, signo);
+}
+
+static int
+env_permitted(char *env)
+{
+       int i;
+       char name[1024], *cp;
+
+       strlcpy(name, env, sizeof(name));
+       if ((cp = strchr(name, '=')) == NULL)
+               return (0);
+
+       *cp = '\0';
+
+       for (i = 0; i < options.num_send_env; i++)
+               if (match_pattern(name, options.send_env[i]))
+                       return (1);
+
+       return (0);
+}
+
+static void
+control_client(const char *path)
+{
+       struct sockaddr_un addr;
+       int i, r, fd, sock, exitval, num_env, addr_len;
+       Buffer m;
+       char *term;
+       extern char **environ;
+       u_int  flags;
+
+       memset(&addr, '\0', sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       addr_len = offsetof(struct sockaddr_un, sun_path) +
+           strlen(path) + 1;
+
+       if (strlcpy(addr.sun_path, path,
+           sizeof(addr.sun_path)) >= sizeof(addr.sun_path))
+               fatal("ControlPath too long");
+
+       if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+               fatal("%s socket(): %s", __func__, strerror(errno));
+
+       if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) {
+               if (mux_command != SSHMUX_COMMAND_OPEN) {
+                       fatal("Control socket connect(%.100s): %s", path,
+                           strerror(errno));
+               }
+               if (errno == ENOENT)
+                       debug("Control socket \"%.100s\" does not exist", path);
+               else {
+                       error("Control socket connect(%.100s): %s", path,
+                           strerror(errno));
+               }
+               close(sock);
+               return;
+       }
+
+       if (stdin_null_flag) {
+               if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
+                       fatal("open(/dev/null): %s", strerror(errno));
+               if (dup2(fd, STDIN_FILENO) == -1)
+                       fatal("dup2: %s", strerror(errno));
+               if (fd > STDERR_FILENO)
+                       close(fd);
+       }
+
+       if ((term = getenv("TERM")) == NULL)
+               term = "";
+
+       flags = 0;
+       if (tty_flag)
+               flags |= SSHMUX_FLAG_TTY;
+       if (subsystem_flag)
+               flags |= SSHMUX_FLAG_SUBSYS;
+
+       buffer_init(&m);
+
+       /* Send our command to server */
+       buffer_put_int(&m, mux_command);
+       buffer_put_int(&m, flags);
+       if (ssh_msg_send(sock, /* version */1, &m) == -1)
+               fatal("%s: msg_send", __func__);
+       buffer_clear(&m);
+
+       /* Get authorisation status and PID of controlee */
+       if (ssh_msg_recv(sock, &m) == -1)
+               fatal("%s: msg_recv", __func__);
+       if (buffer_get_char(&m) != 1)
+               fatal("%s: wrong version", __func__);
+       if (buffer_get_int(&m) != 1)
+               fatal("Connection to master denied");
+       control_server_pid = buffer_get_int(&m);
+
+       buffer_clear(&m);
+
+       switch (mux_command) {
+       case SSHMUX_COMMAND_ALIVE_CHECK:
+               fprintf(stderr, "Master running (pid=%d)\r\n",
+                   control_server_pid);
+               exit(0);
+       case SSHMUX_COMMAND_TERMINATE:
+               fprintf(stderr, "Exit request sent.\r\n");
+               exit(0);
+       case SSHMUX_COMMAND_OPEN:
+               /* continue below */
+               break;
+       default:
+               fatal("silly mux_command %d", mux_command);
+       }
+
+       /* SSHMUX_COMMAND_OPEN */
+       buffer_put_cstring(&m, term);
+       buffer_append(&command, "\0", 1);
+       buffer_put_cstring(&m, buffer_ptr(&command));
+
+       if (options.num_send_env == 0 || environ == NULL) {
+               buffer_put_int(&m, 0);
        } else {
-               window *= 2;
-               packetmax = window/2;
+               /* Pass environment */
+               num_env = 0;
+               for (i = 0; environ[i] != NULL; i++)
+                       if (env_permitted(environ[i]))
+                               num_env++; /* Count */
+
+               buffer_put_int(&m, num_env);
+
+               for (i = 0; environ[i] != NULL && num_env >= 0; i++)
+                       if (env_permitted(environ[i])) {
+                               num_env--;
+                               buffer_put_cstring(&m, environ[i]);
+                       }
        }
 
-       id = channel_new(
-           "session", SSH_CHANNEL_OPENING, in, out, err,
-           window, packetmax, CHAN_EXTENDED_WRITE, xstrdup("client-session"));
+       if (ssh_msg_send(sock, /* version */1, &m) == -1)
+               fatal("%s: msg_send", __func__);
+
+       mm_send_fd(sock, STDIN_FILENO);
+       mm_send_fd(sock, STDOUT_FILENO);
+       mm_send_fd(sock, STDERR_FILENO);
+
+       /* Wait for reply, so master has a chance to gather ttymodes */
+       buffer_clear(&m);
+       if (ssh_msg_recv(sock, &m) == -1)
+               fatal("%s: msg_recv", __func__);
+       if (buffer_get_char(&m) != 1)
+               fatal("%s: wrong version", __func__);
+       buffer_free(&m);
+
+       signal(SIGHUP, control_client_sighandler);
+       signal(SIGINT, control_client_sighandler);
+       signal(SIGTERM, control_client_sighandler);
+       signal(SIGWINCH, control_client_sigrelay);
+
+       if (tty_flag)
+               enter_raw_mode();
+
+       /* Stick around until the controlee closes the client_fd */
+       exitval = 0;
+       for (;!control_client_terminate;) {
+               r = read(sock, &exitval, sizeof(exitval));
+               if (r == 0) {
+                       debug2("Received EOF from master");
+                       break;
+               }
+               if (r > 0)
+                       debug2("Received exit status from master %d", exitval);
+               if (r == -1 && errno != EINTR)
+                       fatal("%s: read %s", __func__, strerror(errno));
+       }
+
+       if (control_client_terminate)
+               debug2("Exiting on signal %d", control_client_terminate);
+
+       close(sock);
 
+       leave_raw_mode();
 
-       channel_open(id);
-       channel_register_callback(id, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION, client_init, (void *)0);
+       if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
+               fprintf(stderr, "Connection to master closed.\r\n");
 
-       return client_loop(tty_flag, tty_flag ? options.escape_char : -1);
+       exit(exitval);
 }
This page took 0.142531 seconds and 4 git commands to generate.