- markus@cvs.openbsd.org 2001/10/09 10:12:08

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 4fcaaeae55146fc2ae7f3a1e096a40183ea9dbe7..a19b06b211f7f2f34fc1b34027f7d9b3d8a86c94 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.140 2001/08/29 23:13:10 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.147 2001/10/08 19:05:05 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -258,14 +258,13 @@ main(int ac, char **av)
 {
        int i, opt, exit_status, cerr;
        u_short fwd_port, fwd_host_port;
+       char sfwd_port[6], sfwd_host_port[6];
        char *p, *cp, buf[256];
        struct stat st;
        struct passwd *pw;
        int dummy;
        uid_t original_effective_uid;
-       extern int optopt;
-       extern int optind;
-       extern int optreset;
+       extern int optind, optreset;
        extern char *optarg;
 
        __progname = get_progname(av[0]);
@@ -470,33 +469,31 @@ again:
                case 'l':
                        options.user = optarg;
                        break;
+
+               case 'L':
                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) {
+                       if (sscanf(optarg, "%5[0-9]:%255[^:]:%5[0-9]",
+                           sfwd_port, buf, sfwd_host_port) != 3 &&
+                           sscanf(optarg, "%5[0-9]/%255[^/]/%5[0-9]",
+                           sfwd_port, buf, sfwd_host_port) != 3) {
                                fprintf(stderr,
-                                   "Bad forwarding specification '%s'.\n",
+                                   "Bad forwarding specification '%s'\n",
                                    optarg);
                                usage();
                                /* NOTREACHED */
                        }
-                       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) {
+                       if ((fwd_port = a2port(sfwd_port)) == 0 ||
+                           (fwd_host_port = a2port(sfwd_host_port)) == 0) {
                                fprintf(stderr,
-                                   "Bad forwarding specification '%s'.\n",
-                                   optarg);
-                               usage();
-                               /* NOTREACHED */
+                                   "Bad forwarding port(s) '%s'\n", optarg);
+                               exit(1);
                        }
-                       add_local_forward(&options, fwd_port, buf,
-                           fwd_host_port);
+                       if (opt == 'L')
+                               add_local_forward(&options, fwd_port, buf,
+                                   fwd_host_port);
+                       else if (opt == 'R')
+                               add_remote_forward(&options, fwd_port, buf,
+                                    fwd_host_port);
                        break;
 
                case 'D':
@@ -567,6 +564,7 @@ again:
 
        SSLeay_add_all_algorithms();
        ERR_load_crypto_strings();
+       channel_set_af(IPv4or6);
 
        /* Initialize the command to execute on remote host. */
        buffer_init(&command);
@@ -623,14 +621,16 @@ again:
         * file if the user specifies a config file on the command line.
         */
        if (config != NULL) {
-               read_config_file(config, host, &options);
+               if (!read_config_file(config, host, &options))
+                       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);
 
-               /* Read systemwide configuration file. */
-               read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
-               read_config_file(buf, host, &options);
+               /* Read systemwide configuration file after use config. */
+               (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
        }
 
        /* Fill configuration defaults. */
@@ -681,7 +681,7 @@ again:
 
        /* Open a connection to the remote host. */
 
-       cerr = ssh_connect(host, &hostaddr, options.port,
+       cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6,
            options.connection_attempts,
            original_effective_uid != 0 || !options.use_privileged_port,
            pw, options.proxy_command);
@@ -1031,14 +1031,15 @@ client_subsystem_reply(int type, int plen, void *ctxt)
                    len, buffer_ptr(&command), id);
 }
 
+/* request pty/x11/agent/tcpfwd/shell for channel */
 static void
-ssh_session2_callback(int id, void *arg)
+ssh_session2_setup(int id, void *arg)
 {
        int len;
        int interactive = 0;
        struct termios tio;
 
-       debug("client_init id %d arg %ld", id, (long)arg);
+       debug("ssh_session2_setup: id %d", id);
 
        if (tty_flag) {
                struct winsize ws;
@@ -1107,8 +1108,9 @@ ssh_session2_callback(int id, void *arg)
        packet_set_interactive(interactive);
 }
 
+/* open new channel for a session */
 static int
-ssh_session2_command(void)
+ssh_session2_open(void)
 {
        Channel *c;
        int window, packetmax, in, out, err;
@@ -1143,13 +1145,15 @@ ssh_session2_command(void)
            window, packetmax, CHAN_EXTENDED_WRITE,
            xstrdup("client-session"), /*nonblock*/0);
        if (c == NULL)
-               fatal("ssh_session2_command: channel_new failed");
+               fatal("ssh_session2_open: channel_new failed");
 
-       debug3("ssh_session2_command: channel_new: %d", c->self);
+       debug3("ssh_session2_open: channel_new: %d", c->self);
 
        channel_send_open(c->self);
-       channel_register_callback(c->self, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
-            ssh_session2_callback, (void *)0);
+       if (!no_shell_flag)
+               channel_register_callback(c->self,
+                    SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
+                    ssh_session2_setup, (void *)0);
 
        return c->self;
 }
@@ -1157,12 +1161,13 @@ ssh_session2_command(void)
 static int
 ssh_session2(void)
 {
-       int id;
+       int id = -1;
 
        /* XXX should be pre-session */
        ssh_init_forwarding();
 
-       id = no_shell_flag ? -1 : ssh_session2_command();
+       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)