diff options
author | Damien Miller <djm@mindrot.org> | 2005-06-26 08:56:03 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-06-26 08:56:03 +1000 |
commit | 8f74c8fc3216af41e466dbe7abbe8660679588ad (patch) | |
tree | 7b8e746dc78cf1bf92c75a8fc57874bb922413ee /ssh_config.5 | |
parent | 9651fe690a95378cdb9b2a1cf3e8c5cb625052c7 (diff) |
- djm@cvs.openbsd.org 2005/06/18 04:30:36
[ssh.c ssh_config.5]
allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index a04ffc288..3e7ca8f28 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.56 2005/06/08 11:25:09 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 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 |
@@ -293,7 +293,9 @@ option. | |||
293 | Specify the path to the control socket used for connection sharing as described | 293 | Specify the path to the control socket used for connection sharing as described |
294 | in the | 294 | in the |
295 | .Cm ControlMaster | 295 | .Cm ControlMaster |
296 | section above. | 296 | section above or the string |
297 | .Dq none | ||
298 | to disable connection sharing. | ||
297 | In the path, | 299 | In the path, |
298 | .Ql %h | 300 | .Ql %h |
299 | will be substituted by the target host name, | 301 | will be substituted by the target host name, |