- OpenBSD CVS updates.

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index a387d66c7d6186312079fc7214b2e2be10aaab58..417332850a60771f4e0b2430c9c942168cfa38c1 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -138,6 +138,7 @@ usage()
        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);
 }
@@ -251,8 +252,8 @@ main(int ac, char **av)
                        if (host)
                                break;
                        if ((cp = strchr(av[optind], '@'))) {
-                               if(cp == av[optind])
-                                       usage();
+                               if(cp == av[optind])
+                                       usage();
                                options.user = av[optind];
                                *cp = '\0';
                                host = ++cp;
@@ -276,39 +277,34 @@ main(int ac, char **av)
                        optarg = NULL;
                }
                switch (opt) {
+               case '2':
+                       options.protocol = SSH_PROTO_2;
+                       break;
                case '4':
                        IPv4or6 = AF_INET;
                        break;
-
                case '6':
                        IPv4or6 = AF_INET6;
                        break;
-
                case 'n':
                        stdin_null_flag = 1;
                        break;
-
                case 'f':
                        fork_after_authentication_flag = 1;
                        stdin_null_flag = 1;
                        break;
-
                case 'x':
                        options.forward_x11 = 0;
                        break;
-
                case 'X':
                        options.forward_x11 = 1;
                        break;
-
                case 'g':
                        options.gateway_ports = 1;
                        break;
-
                case 'P':
                        options.use_privileged_port = 0;
                        break;
-
                case 'a':
                        options.forward_agent = 0;
                        break;
@@ -330,11 +326,9 @@ main(int ac, char **av)
                        options.identity_files[options.num_identity_files++] =
                                xstrdup(optarg);
                        break;
-
                case 't':
                        tty_flag = 1;
                        break;
-
                case 'v':
                case 'V':
                        fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n",
@@ -347,11 +341,9 @@ main(int ac, char **av)
                        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)
@@ -365,7 +357,6 @@ main(int ac, char **av)
                                exit(1);
                        }
                        break;
-
                case 'c':
                        options.cipher = cipher_number(optarg);
                        if (options.cipher == -1) {
@@ -373,15 +364,12 @@ main(int ac, char **av)
                                exit(1);
                        }
                        break;
-
                case 'p':
                        options.port = atoi(optarg);
                        break;
-
                case 'l':
                        options.user = optarg;
                        break;
-
                case 'R':
                        if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
                            &fwd_host_port) != 3 &&
@@ -393,7 +381,6 @@ main(int ac, char **av)
                        }
                        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 &&
@@ -405,27 +392,22 @@ main(int ac, char **av)
                        }
                        add_local_forward(&options, fwd_port, buf, fwd_host_port);
                        break;
-
                case 'C':
                        options.compression = 1;
                        break;
-
                case 'N':
                        no_shell_flag = 1;
                        no_tty_flag = 1;
                        break;
-
                case 'T':
                        no_tty_flag = 1;
                        break;
-
                case 'o':
                        dummy = 1;
                        if (process_config_line(&options, host ? host : "", optarg,
                                         "command-line", 0, &dummy) != 0)
                                exit(1);
                        break;
-
                default:
                        usage();
                }
@@ -634,7 +616,7 @@ main(int ac, char **av)
 
        /* Expand ~ in known host file names. */
        options.system_hostfile = tilde_expand_filename(options.system_hostfile,
-                                                       original_real_uid);
+                                                       original_real_uid);
        options.user_hostfile = tilde_expand_filename(options.user_hostfile,
                                                      original_real_uid);
 
@@ -803,7 +785,7 @@ ssh_session(void)
                      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,
                                                 options.local_forwards[i].host_port,
                                                 options.gateway_ports);
        }
@@ -816,11 +798,11 @@ ssh_session(void)
                      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);
+                                                 options.remote_forwards[i].host_port);
        }
 
        /* If requested, let ssh continue in the background. */
-       if (fork_after_authentication_flag) 
+       if (fork_after_authentication_flag)
                if (daemon(1, 1) < 0)
                        fatal("daemon() failed: %.200s", strerror(errno));
 
@@ -859,7 +841,7 @@ init_local_fwd(void)
                      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,
                                                 options.local_forwards[i].host_port,
                                                 options.gateway_ports);
        }