summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-14 10:09:56 +1100
committerDamien Miller <djm@mindrot.org>2006-01-14 10:09:56 +1100
commit7c24b81699c9b45f277ccefa5523e1a8d64a98a5 (patch)
tree9ff2c2f0f389a3dea40ef23c3056ee20fa2db86e
parent8bfaf93f607ab97ed09a9247bbf23ca82ffcf75e (diff)
- jmc@cvs.openbsd.org 2006/01/12 22:20:00
[sshd.8] refer to TCP forwarding, rather than TCP/IP forwarding;
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b562035ef..b68b88e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 refer to `TCP' rather than `TCP/IP' in the context of connection 19 refer to `TCP' rather than `TCP/IP' in the context of connection
20 forwarding; 20 forwarding;
21 ok markus 21 ok markus
22 - jmc@cvs.openbsd.org 2006/01/12 22:20:00
23 [sshd.8]
24 refer to TCP forwarding, rather than TCP/IP forwarding;
22 25
2320060109 2620060109
24 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on 27 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
@@ -3696,4 +3699,4 @@
3696 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3699 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3697 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3700 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3698 3701
3699$Id: ChangeLog,v 1.4087 2006/01/13 23:09:30 djm Exp $ 3702$Id: ChangeLog,v 1.4088 2006/01/13 23:09:56 djm Exp $
diff --git a/sshd.8 b/sshd.8
index ee6e7d797..241aefd43 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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: sshd.8,v 1.210 2005/12/21 22:44:26 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.211 2006/01/12 22:20:00 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -169,7 +169,7 @@ If the client successfully authenticates itself, a dialog for
169preparing the session is entered. 169preparing the session is entered.
170At this time the client may request 170At this time the client may request
171things like allocating a pseudo-tty, forwarding X11 connections, 171things like allocating a pseudo-tty, forwarding X11 connections,
172forwarding TCP/IP connections, or forwarding the authentication agent 172forwarding TCP connections, or forwarding the authentication agent
173connection over the secure channel. 173connection over the secure channel.
174.Pp 174.Pp
175Finally, the client either requests a shell or execution of a command. 175Finally, the client either requests a shell or execution of a command.
@@ -480,7 +480,7 @@ A quote may be included in the command by quoting it with a backslash.
480This option might be useful 480This option might be useful
481to restrict certain public keys to perform just a specific operation. 481to restrict certain public keys to perform just a specific operation.
482An example might be a key that permits remote backups but nothing else. 482An example might be a key that permits remote backups but nothing else.
483Note that the client may specify TCP/IP and/or X11 483Note that the client may specify TCP and/or X11
484forwarding unless they are explicitly prohibited. 484forwarding unless they are explicitly prohibited.
485Note that this option applies to shell, command or subsystem execution. 485Note that this option applies to shell, command or subsystem execution.
486.It Cm environment="NAME=value" 486.It Cm environment="NAME=value"
@@ -497,7 +497,7 @@ This option is automatically disabled if
497.Cm UseLogin 497.Cm UseLogin
498is enabled. 498is enabled.
499.It Cm no-port-forwarding 499.It Cm no-port-forwarding
500Forbids TCP/IP forwarding when this key is used for authentication. 500Forbids TCP forwarding when this key is used for authentication.
501Any port forward requests by the client will return an error. 501Any port forward requests by the client will return an error.
502This might be used, e.g., in connection with the 502This might be used, e.g., in connection with the
503.Cm command 503.Cm command