ssh -2

diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 55a3866..b91c51c 100644 (file)
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: ssh.1,v 1.45 2000/04/12 23:00:28 markus Exp $
+.\" $Id: ssh.1,v 1.46 2000/04/14 10:11:12 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH 1
@@ -24,7 +24,7 @@
 .Op Ar command
 .Pp
 .Nm ssh
-.Op Fl afgknqtvxCPX46
+.Op Fl afgknqtvxCPX246
 .Op Fl c Ar blowfish | 3des
 .Op Fl e Ar escape_char
 .Op Fl i Ar identity_file
@@ -455,6 +455,10 @@ from the local machine.
 Port forwardings can also be specified in the configuration file.
 Privileged ports can be forwarded only when
 logging in as root on the remote machine.
+.It Fl 2
+Forces
+.Nm
+to use protocol version 2 only.
 .It Fl 4
 Forces
 .Nm

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index ecf3e82..b598fa7 100644 (file)
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh.c,v 1.46 2000/04/12 07:45:44 markus Exp $");
+RCSID("$Id: ssh.c,v 1.47 2000/04/14 10:11:12 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -128,6 +128,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);
 }
@@ -266,6 +267,10 @@ main(int ac, char **av)
                        optarg = NULL;
                }
                switch (opt) {
+               case '2':
+                       options.protocol = SSH_PROTO_2;
+                       break;
+
                case '4':
                        IPv4or6 = AF_INET;
                        break;