diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.218 2004/06/18 10:40:19 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.219 2004/06/18 10:55:43 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -160,8 +160,7 @@ usage(void) | |||
160 | "usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" | 160 | "usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" |
161 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" | 161 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" |
162 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" | 162 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" |
163 | " [-p port] [-R port:host:hostport] [-S ctl_path]\n" | 163 | " [-p port] [-R port:host:hostport] [-S ctl] [user@]hostname [command]\n" |
164 | " [user@]hostname [command]\n" | ||
165 | ); | 164 | ); |
166 | exit(1); | 165 | exit(1); |
167 | } | 166 | } |
@@ -377,7 +376,8 @@ again: | |||
377 | } | 376 | } |
378 | break; | 377 | break; |
379 | case 'M': | 378 | case 'M': |
380 | options.control_master = 1; | 379 | options.control_master = |
380 | (options.control_master >= 1) ? 2 : 1; | ||
381 | break; | 381 | break; |
382 | case 'p': | 382 | case 'p': |
383 | options.port = a2port(optarg); | 383 | options.port = a2port(optarg); |
@@ -451,8 +451,6 @@ again: | |||
451 | if (options.control_path != NULL) | 451 | if (options.control_path != NULL) |
452 | free(options.control_path); | 452 | free(options.control_path); |
453 | options.control_path = xstrdup(optarg); | 453 | options.control_path = xstrdup(optarg); |
454 | if (options.control_master == -1) | ||
455 | options.control_master = 0; | ||
456 | break; | 454 | break; |
457 | case 'b': | 455 | case 'b': |
458 | options.bind_address = optarg; | 456 | options.bind_address = optarg; |