summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-30 12:32:28 +1000
committerDamien Miller <djm@mindrot.org>2014-07-30 12:32:28 +1000
commita8a0f65c57c8ecba94d65948e9090da54014dfef (patch)
treef0045dfd663301a8d43a7c5d4ae7df1c804789db
parent56b840f2b81e14a2f95c203403633a72566736f8 (diff)
- OpenBSD CVS Sync
- millert@cvs.openbsd.org 2014/07/24 22:57:10 [ssh.1] Mention UNIX-domain socket forwarding too. OK jmc@ deraadt@
-rw-r--r--ChangeLog6
-rw-r--r--ssh.113
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 04dea31fb..3a91bae27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120140730
2 - OpenBSD CVS Sync
3 - millert@cvs.openbsd.org 2014/07/24 22:57:10
4 [ssh.1]
5 Mention UNIX-domain socket forwarding too. OK jmc@ deraadt@
6
120140725 720140725
2 - (djm) [regress/multiplex.sh] restore incorrectly deleted line; 8 - (djm) [regress/multiplex.sh] restore incorrectly deleted line;
3 pointed out by Christian Hesse 9 pointed out by Christian Hesse
diff --git a/ssh.1 b/ssh.1
index bb486aad6..fa5cfb2c2 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.347 2014/07/16 14:48:57 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.348 2014/07/24 22:57:10 millert Exp $
37.Dd $Mdocdate: July 16 2014 $ 37.Dd $Mdocdate: July 24 2014 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -73,8 +73,9 @@ executing commands on a remote machine.
73It is intended to replace rlogin and rsh, 73It is intended to replace rlogin and rsh,
74and provide secure encrypted communications between 74and provide secure encrypted communications between
75two untrusted hosts over an insecure network. 75two untrusted hosts over an insecure network.
76X11 connections and arbitrary TCP ports 76X11 connections, arbitrary TCP ports and
77can also be forwarded over the secure channel. 77.Ux Ns -domain
78sockets can also be forwarded over the secure channel.
78.Pp 79.Pp
79.Nm 80.Nm
80connects and logs into the specified 81connects and logs into the specified
@@ -131,7 +132,9 @@ of the connection.
131Only useful on systems with more than one address. 132Only useful on systems with more than one address.
132.It Fl C 133.It Fl C
133Requests compression of all data (including stdin, stdout, stderr, and 134Requests compression of all data (including stdin, stdout, stderr, and
134data for forwarded X11 and TCP connections). 135data for forwarded X11, TCP and
136.Ux Ns -domain
137connections).
135The compression algorithm is the same used by 138The compression algorithm is the same used by
136.Xr gzip 1 , 139.Xr gzip 1 ,
137and the 140and the