diff options
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 28913232fdb..ff9090942a1 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.84 2001/02/04 15:10:44 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.85 2001/02/06 23:03:24 jakob Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -549,6 +549,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 1 +Forces +.Nm +to try protocol version 1 only. .It Fl 2 Forces .Nm diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index a89b66cd00d..7278d7d00bc 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.90 2001/02/06 22:43:02 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.91 2001/02/06 23:03:24 jakob Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -175,6 +175,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, " -1 Force protocol version 1.\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"); fprintf(stderr, " -s Invoke command (mandatory) as SSH2 subsystem.\n"); @@ -310,6 +311,9 @@ main(int ac, char **av) optarg = NULL; } switch (opt) { + case '1': + options.protocol = SSH_PROTO_1; + break; case '2': options.protocol = SSH_PROTO_2; break; |