diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh.1 | 50 |
2 files changed, 30 insertions, 29 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20050302 | ||
2 | - (djm) OpenBSD CVS sync: | ||
3 | - jmc@cvs.openbsd.org 2005/03/01 14:47:58 | ||
4 | [ssh.1] | ||
5 | remove some unneccesary macros; | ||
6 | do not mark up punctuation; | ||
7 | |||
1 | 20050301 | 8 | 20050301 |
2 | - (djm) OpenBSD CVS sync: | 9 | - (djm) OpenBSD CVS sync: |
3 | - otto@cvs.openbsd.org 2005/02/16 09:56:44 | 10 | - otto@cvs.openbsd.org 2005/02/16 09:56:44 |
@@ -2216,4 +2223,4 @@ | |||
2216 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2223 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2217 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2224 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2218 | 2225 | ||
2219 | $Id: ChangeLog,v 1.3675 2005/03/01 10:48:35 djm Exp $ | 2226 | $Id: ChangeLog,v 1.3676 2005/03/02 01:02:47 djm Exp $ |
@@ -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.201 2005/03/01 10:40:27 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.202 2005/03/01 14:47:58 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -43,42 +43,35 @@ | |||
43 | .Nd OpenSSH SSH client (remote login program) | 43 | .Nd OpenSSH SSH client (remote login program) |
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Nm ssh | 45 | .Nm ssh |
46 | .Bk -words | ||
46 | .Op Fl 1246AaCfgkMNnqsTtVvXxY | 47 | .Op Fl 1246AaCfgkMNnqsTtVvXxY |
47 | .Op Fl b Ar bind_address | 48 | .Op Fl b Ar bind_address |
48 | .Op Fl c Ar cipher_spec | 49 | .Op Fl c Ar cipher_spec |
49 | .Bk -words | ||
50 | .Op Fl D Ar port | 50 | .Op Fl D Ar port |
51 | .Op Fl e Ar escape_char | 51 | .Op Fl e Ar escape_char |
52 | .Op Fl F Ar configfile | 52 | .Op Fl F Ar configfile |
53 | .Op Fl i Ar identity_file | 53 | .Op Fl i Ar identity_file |
54 | .Oo Fl L Xo | 54 | .Oo Fl L\ \& |
55 | .Sm off | 55 | .Sm off |
56 | .Oo Ar bind_address : Oc | 56 | .Oo Ar bind_address : Oc |
57 | .Ar port : | 57 | .Ar port : host : hostport |
58 | .Ar host : | ||
59 | .Ar hostport | ||
60 | .Sm on | 58 | .Sm on |
61 | .Xc | ||
62 | .Oc | 59 | .Oc |
63 | .Op Fl l Ar login_name | 60 | .Op Fl l Ar login_name |
64 | .Op Fl m Ar mac_spec | 61 | .Op Fl m Ar mac_spec |
65 | .Op Fl O Ar ctl_cmd | 62 | .Op Fl O Ar ctl_cmd |
66 | .Op Fl o Ar option | 63 | .Op Fl o Ar option |
67 | .Bk -words | ||
68 | .Op Fl p Ar port | 64 | .Op Fl p Ar port |
69 | .Ek | 65 | .Oo Fl R\ \& |
70 | .Oo Fl R Xo | ||
71 | .Sm off | 66 | .Sm off |
72 | .Oo Ar bind_address : Oc | 67 | .Oo Ar bind_address : Oc |
73 | .Ar port : | 68 | .Ar port : host : hostport |
74 | .Ar host : | ||
75 | .Ar hostport | ||
76 | .Sm on | 69 | .Sm on |
77 | .Xc | ||
78 | .Oc | 70 | .Oc |
79 | .Op Fl S Ar ctl_path | 71 | .Op Fl S Ar ctl_path |
80 | .Oo Ar user Ns @ Oc Ns Ar hostname | 72 | .Oo Ar user Ns @ Oc Ns Ar hostname |
81 | .Op Ar command | 73 | .Op Ar command |
74 | .Ek | ||
82 | .Sh DESCRIPTION | 75 | .Sh DESCRIPTION |
83 | .Nm | 76 | .Nm |
84 | (SSH client) is a program for logging into a remote machine and for | 77 | (SSH client) is a program for logging into a remote machine and for |
@@ -592,7 +585,7 @@ Port forwardings can also be specified in the configuration file. | |||
592 | IPv6 addresses can be specified with an alternative syntax: | 585 | IPv6 addresses can be specified with an alternative syntax: |
593 | .Sm off | 586 | .Sm off |
594 | .Xo | 587 | .Xo |
595 | .Oo Ar bind_address / Oc | 588 | .Oo Ar bind_address No / Oc |
596 | .Ar port No / Ar host No / | 589 | .Ar port No / Ar host No / |
597 | .Ar hostport | 590 | .Ar hostport |
598 | .Xc | 591 | .Xc |
@@ -609,9 +602,9 @@ The | |||
609 | .Ar bind_address | 602 | .Ar bind_address |
610 | of | 603 | of |
611 | .Dq localhost | 604 | .Dq localhost |
612 | indicates that the listening port be bound for local use only, while an | 605 | indicates that the listening port be bound for local use only, while an |
613 | empty address or | 606 | empty address or |
614 | .Dq * | 607 | .Sq * |
615 | indicates that the port should be available from all interfaces. | 608 | indicates that the port should be available from all interfaces. |
616 | .It Fl l Ar login_name | 609 | .It Fl l Ar login_name |
617 | Specifies the user to log in as on the remote machine. | 610 | Specifies the user to log in as on the remote machine. |
@@ -766,28 +759,29 @@ Privileged ports can be forwarded only when | |||
766 | logging in as root on the remote machine. | 759 | logging in as root on the remote machine. |
767 | IPv6 addresses can be specified by enclosing the address in square braces or | 760 | IPv6 addresses can be specified by enclosing the address in square braces or |
768 | using an alternative syntax: | 761 | using an alternative syntax: |
769 | .Xo | ||
770 | .Sm off | 762 | .Sm off |
771 | .Oo Ar bind_address / Oc | 763 | .Xo |
772 | .Ar host/port/hostport | 764 | .Oo Ar bind_address No / Oc |
773 | .Sm on | 765 | .Ar host No / Ar port No / |
766 | .Ar hostport | ||
774 | .Xc . | 767 | .Xc . |
768 | .Sm on | ||
775 | .Pp | 769 | .Pp |
776 | By default, the listening socket on the server will be bound to the loopback | 770 | By default, the listening socket on the server will be bound to the loopback |
777 | interface only. | 771 | interface only. |
778 | This may be overriden by specifying a | 772 | This may be overriden by specifying a |
779 | .Ar bind_address . | 773 | .Ar bind_address . |
780 | An empty | 774 | An empty |
781 | .Ar bind_address , | 775 | .Ar bind_address , |
782 | or the address | 776 | or the address |
783 | .Ql * | 777 | .Ql * , |
784 | indicates that the remote socket should listen on all interfaces. | 778 | indicates that the remote socket should listen on all interfaces. |
785 | Specifying a remote | 779 | Specifying a remote |
786 | .Ar bind_address | 780 | .Ar bind_address |
787 | will only succeed if the server's | 781 | will only succeed if the server's |
788 | .Cm GatewayPorts | 782 | .Cm GatewayPorts |
789 | option is enabled (see | 783 | option is enabled (see |
790 | .Xr sshd_config 5 ). | 784 | .Xr sshd_config 5 ) . |
791 | .It Fl S Ar ctl_path | 785 | .It Fl S Ar ctl_path |
792 | Specifies the location of a control socket for connection sharing. | 786 | Specifies the location of a control socket for connection sharing. |
793 | Refer to the description of | 787 | Refer to the description of |