summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-14 10:10:17 +1100
committerDamien Miller <djm@mindrot.org>2006-01-14 10:10:17 +1100
commite9d001e02b55f065b7a16d3e2b3d041d32ee9176 (patch)
treeac52da23f998c5bd44f4f1759b421d2b1a60d70e
parent7c24b81699c9b45f277ccefa5523e1a8d64a98a5 (diff)
- jmc@cvs.openbsd.org 2006/01/12 22:26:02
[ssh_config.5] refer to TCP forwarding, rather than TCP/IP forwarding;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b68b88e9a..18b9ec375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
22 - jmc@cvs.openbsd.org 2006/01/12 22:20:00 22 - jmc@cvs.openbsd.org 2006/01/12 22:20:00
23 [sshd.8] 23 [sshd.8]
24 refer to TCP forwarding, rather than TCP/IP forwarding; 24 refer to TCP forwarding, rather than TCP/IP forwarding;
25 - jmc@cvs.openbsd.org 2006/01/12 22:26:02
26 [ssh_config.5]
27 refer to TCP forwarding, rather than TCP/IP forwarding;
25 28
2620060109 2920060109
27 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on 30 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
@@ -3699,4 +3702,4 @@
3699 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3702 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3700 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3703 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3701 3704
3702$Id: ChangeLog,v 1.4088 2006/01/13 23:09:56 djm Exp $ 3705$Id: ChangeLog,v 1.4089 2006/01/13 23:10:17 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index d091bcbf9..e8186a988 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.73 2006/01/02 17:09:49 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.74 2006/01/12 22:26:02 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -318,7 +318,7 @@ used for opportunistic connection sharing include
318all three of these escape sequences. 318all three of these escape sequences.
319This ensures that shared connections are uniquely identified. 319This ensures that shared connections are uniquely identified.
320.It Cm DynamicForward 320.It Cm DynamicForward
321Specifies that a TCP/IP port on the local machine be forwarded 321Specifies that a TCP port on the local machine be forwarded
322over the secure channel, and the application 322over the secure channel, and the application
323protocol is then used to determine where to connect to from the 323protocol is then used to determine where to connect to from the
324remote machine. 324remote machine.
@@ -565,7 +565,7 @@ This directive is ignored unless
565.Cm PermitLocalCommand 565.Cm PermitLocalCommand
566has been enabled. 566has been enabled.
567.It Cm LocalForward 567.It Cm LocalForward
568Specifies that a TCP/IP port on the local machine be forwarded over 568Specifies that a TCP port on the local machine be forwarded over
569the secure channel to the specified host and port from the remote machine. 569the secure channel to the specified host and port from the remote machine.
570The first argument must be 570The first argument must be
571.Sm off 571.Sm off
@@ -719,7 +719,7 @@ The default is
719.Dq yes . 719.Dq yes .
720This option applies to protocol version 2 only. 720This option applies to protocol version 2 only.
721.It Cm RemoteForward 721.It Cm RemoteForward
722Specifies that a TCP/IP port on the remote machine be forwarded over 722Specifies that a TCP port on the remote machine be forwarded over
723the secure channel to the specified host and port from the local machine. 723the secure channel to the specified host and port from the local machine.
724The first argument must be 724The first argument must be
725.Sm off 725.Sm off