diff options
| author |   markus <markus@openbsd.org> | 2004-06-18 10:55:43 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2004-06-18 10:55:43 +0000 |
| commit | 73ae69cb01660039a83635b5f6fdf3b2444a96af (patch) | |
| tree | 62c3197a942fd8c7cc10d23d9e1bfb598e07380a | |
| parent | delay signal handler setup until we have finished talking to the master. (diff) | |
| download | wireguard-openbsd-73ae69cb01660039a83635b5f6fdf3b2444a96af.tar.xz wireguard-openbsd-73ae69cb01660039a83635b5f6fdf3b2444a96af.zip | |
trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask'; ok djm
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index dcd02c28f40..5cdeee2dab2 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.191 2004/06/17 23:56:57 djm Exp $ +.\" $OpenBSD: ssh.1,v 1.192 2004/06/18 10:55:43 markus Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -74,7 +74,7 @@ .Sm on .Xc .Oc -.Op Fl S Ar ctl_path +.Op Fl S Ar ctl .Oo Ar user Ns @ Oc Ns Ar hostname .Op Ar command .Sh DESCRIPTION @@ -738,7 +738,7 @@ IPv6 addresses can be specified with an alternative syntax: .Ar hostport . .Xc .Sm on -.It Fl S Ar ctl_path +.It Fl S Ar ctl Specifies the location of a control socket for for connection sharing. Refer to the description of .Cm ControlPath diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 9124dff0248..f5c3cb7bd6d 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.218 2004/06/18 10:40:19 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.219 2004/06/18 10:55:43 markus Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -156,8 +156,7 @@ usage(void) "usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" -" [-p port] [-R port:host:hostport] [-S ctl_path]\n" -" [user@]hostname [command]\n" +" [-p port] [-R port:host:hostport] [-S ctl] [user@]hostname [command]\n" ); exit(1); } @@ -368,7 +367,8 @@ again: } break; case 'M': - options.control_master = 1; + options.control_master = + (options.control_master >= 1) ? 2 : 1; break; case 'p': options.port = a2port(optarg); @@ -442,8 +442,6 @@ again: if (options.control_path != NULL) free(options.control_path); options.control_path = xstrdup(optarg); - if (options.control_master == -1) - options.control_master = 0; break; case 'b': options.bind_address = optarg; |