shared connection env passing regress test
- (dtucker) [regress/README.regress] Add detail on how to run a single
test from the top-level Makefile.
+ - (dtucker) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2004/06/17 23:56:57
+ [ssh.1 ssh.c]
+ sync usage() and SYNPOSIS with connection sharing changes
20040617
- (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
.\" (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.190 2004/06/13 15:03:02 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.191 2004/06/17 23:56:57 djm Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
.Nd OpenSSH SSH client (remote login program)
.Sh SYNOPSIS
.Nm ssh
-.Op Fl 1246AaCfgkMNnqSsTtVvXxY
+.Op Fl 1246AaCfgkMNnqsTtVvXxY
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
.Op Fl D Ar port
.Sm on
.Xc
.Oc
+.Op Fl S Ar ctl_path
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Sh DESCRIPTION
.Ar hostport .
.Xc
.Sm on
-.It Fl S
-Places the
-.Nm
-client into slave mode for connection sharing.
+.It Fl S Ar ctl_path
+Specifies the location of a control socket for for connection sharing.
Refer to the description of
+.Cm ControlPath
+and
.Cm ControlMaster
in
.Xr ssh_config 5
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.216 2004/06/17 15:10:14 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.217 2004/06/17 23:56:57 djm Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
usage(void)
{
fprintf(stderr,
-"usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+"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] [user@]hostname [command]\n"
+" [-p port] [-R port:host:hostport] [-S ctl_path]\n"
+" [user@]hostname [command]\n"
);
exit(1);
}