diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:34:08 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:34:08 +1000 |
commit | 0e220dbfbcc9fe252e8f1f4890dbfa415aad35db (patch) | |
tree | b78bab0c628cd5bdb0ec95340f533a1be2fae75f /ssh_config.5 | |
parent | 05202ffe214115afa24bf6e7a6d8c8457e6759bb (diff) |
- djm@cvs.openbsd.org 2004/06/13 15:03:02
[channels.c channels.h clientloop.c clientloop.h includes.h readconf.c]
[readconf.h scp.1 sftp.1 ssh.1 ssh.c ssh_config.5]
implement session multiplexing in the client (the server has supported
this since 2.0); ok markus@
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 46d3012c8..bab11d313 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.35 2004/06/13 14:01:42 dtucker Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.36 2004/06/13 15:03:02 djm 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 |
@@ -256,6 +256,28 @@ will act as a SOCKS server. | |||
256 | Multiple forwardings may be specified, and | 256 | Multiple forwardings may be specified, and |
257 | additional forwardings can be given on the command line. | 257 | additional forwardings can be given on the command line. |
258 | Only the superuser can forward privileged ports. | 258 | Only the superuser can forward privileged ports. |
259 | .It Cm ControlMaster | ||
260 | Enables the sharing of multiple sessions over a single network connection. | ||
261 | When set to | ||
262 | .Dq yes | ||
263 | .Nm ssh | ||
264 | will listen for connections on a control socket specified using the | ||
265 | .Cm ControlPath | ||
266 | argument. | ||
267 | Additional sessions can connect to this socket using the same | ||
268 | .Cm ControlPath | ||
269 | with | ||
270 | .Cm ControlMaster | ||
271 | set to | ||
272 | .Dq no | ||
273 | (the default.) | ||
274 | These sessions will reuse the master instance's network connection rather | ||
275 | than initiating new ones. | ||
276 | .It Cm ControlPath | ||
277 | Specify a the path to the control socket used for connection sharing. | ||
278 | See | ||
279 | .Cm ControlMaster | ||
280 | above. | ||
259 | .It Cm EnableSSHKeysign | 281 | .It Cm EnableSSHKeysign |
260 | Setting this option to | 282 | Setting this option to |
261 | .Dq yes | 283 | .Dq yes |