summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.16
-rw-r--r--ssh.c10
3 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 56237e3de..adbb925ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
28 [ssh.c] 28 [ssh.c]
29 delay signal handler setup until we have finished talking to the master. 29 delay signal handler setup until we have finished talking to the master.
30 allow interrupting of setup (e.g. if master is stuck); ok markus@ 30 allow interrupting of setup (e.g. if master is stuck); ok markus@
31 - markus@cvs.openbsd.org 2004/06/18 10:55:43
32 [ssh.1 ssh.c]
33 trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask';
34 ok djm
31 35
3220040617 3620040617
33 - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some 37 - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1301,4 +1305,4 @@
1301 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1305 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1302 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1306 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1303 1307
1304$Id: ChangeLog,v 1.3412 2004/06/18 12:20:57 djm Exp $ 1308$Id: ChangeLog,v 1.3413 2004/06/18 12:21:55 djm Exp $
diff --git a/ssh.1 b/ssh.1
index dcd02c28f..5cdeee2da 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.191 2004/06/17 23:56:57 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.192 2004/06/18 10:55:43 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -74,7 +74,7 @@
74.Sm on 74.Sm on
75.Xc 75.Xc
76.Oc 76.Oc
77.Op Fl S Ar ctl_path 77.Op Fl S Ar ctl
78.Oo Ar user Ns @ Oc Ns Ar hostname 78.Oo Ar user Ns @ Oc Ns Ar hostname
79.Op Ar command 79.Op Ar command
80.Sh DESCRIPTION 80.Sh DESCRIPTION
@@ -738,7 +738,7 @@ IPv6 addresses can be specified with an alternative syntax:
738.Ar hostport . 738.Ar hostport .
739.Xc 739.Xc
740.Sm on 740.Sm on
741.It Fl S Ar ctl_path 741.It Fl S Ar ctl
742Specifies the location of a control socket for for connection sharing. 742Specifies the location of a control socket for for connection sharing.
743Refer to the description of 743Refer to the description of
744.Cm ControlPath 744.Cm ControlPath
diff --git a/ssh.c b/ssh.c
index 89b038198..59f4f41bd 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.218 2004/06/18 10:40:19 djm Exp $"); 43RCSID("$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;