summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.532
2 files changed, 20 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 511aeb2bd..41b5891d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - remove double word 7 - remove double word
8 - rearrange .Bk to keep SYNOPSIS nice 8 - rearrange .Bk to keep SYNOPSIS nice
9 - -M before -m in options description 9 - -M before -m in options description
10 - jmc@cvs.openbsd.org 2004/06/26 09:11:14
11 [ssh_config.5]
12 punctuation and grammar fixes. also, keep the options in order.
10 13
1120040627 1420040627
12 - (tim) update README files. 15 - (tim) update README files.
@@ -1453,4 +1456,4 @@
1453 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1456 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1454 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1457 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1455 1458
1456$Id: ChangeLog,v 1.3459 2004/06/30 12:37:57 djm Exp $ 1459$Id: ChangeLog,v 1.3460 2004/06/30 12:38:52 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 3e8c1db06..0e1a031e5 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.37 2004/06/17 15:10:14 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.38 2004/06/26 09:11:14 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
@@ -244,18 +244,6 @@ Specifies the timeout (in seconds) used when connecting to the ssh
244server, instead of using the default system TCP timeout. 244server, instead of using the default system TCP timeout.
245This value is used only when the target is down or really unreachable, 245This value is used only when the target is down or really unreachable,
246not when it refuses the connection. 246not when it refuses the connection.
247.It Cm DynamicForward
248Specifies that a TCP/IP port on the local machine be forwarded
249over the secure channel, and the application
250protocol is then used to determine where to connect to from the
251remote machine.
252The argument must be a port number.
253Currently the SOCKS4 and SOCKS5 protocols are supported, and
254.Nm ssh
255will act as a SOCKS server.
256Multiple forwardings may be specified, and
257additional forwardings can be given on the command line.
258Only the superuser can forward privileged ports.
259.It Cm ControlMaster 247.It Cm ControlMaster
260Enables the sharing of multiple sessions over a single network connection. 248Enables the sharing of multiple sessions over a single network connection.
261When set to 249When set to
@@ -270,7 +258,7 @@ with
270.Cm ControlMaster 258.Cm ControlMaster
271set to 259set to
272.Dq no 260.Dq no
273(the default.) 261(the default).
274These sessions will reuse the master instance's network connection rather 262These sessions will reuse the master instance's network connection rather
275than initiating new ones. 263than initiating new ones.
276Setting this to 264Setting this to
@@ -281,12 +269,24 @@ to listen for control connections, but require confirmation using the
281.Ev SSH_ASKPASS 269.Ev SSH_ASKPASS
282program before they are accepted (see 270program before they are accepted (see
283.Xr ssh-add 1 271.Xr ssh-add 1
284for details) 272for details).
285.It Cm ControlPath 273.It Cm ControlPath
286Specify a the path to the control socket used for connection sharing. 274Specify the path to the control socket used for connection sharing.
287See 275See
288.Cm ControlMaster 276.Cm ControlMaster
289above. 277above.
278.It Cm DynamicForward
279Specifies that a TCP/IP port on the local machine be forwarded
280over the secure channel, and the application
281protocol is then used to determine where to connect to from the
282remote machine.
283The argument must be a port number.
284Currently the SOCKS4 and SOCKS5 protocols are supported, and
285.Nm ssh
286will act as a SOCKS server.
287Multiple forwardings may be specified, and
288additional forwardings can be given on the command line.
289Only the superuser can forward privileged ports.
290.It Cm EnableSSHKeysign 290.It Cm EnableSSHKeysign
291Setting this option to 291Setting this option to
292.Dq yes 292.Dq yes