From d313869b3d374f5590bc5b37fa983716080156d0 Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 5 Jul 2005 23:44:59 +0000 Subject: [PATCH] - jmc@cvs.openbsd.org 2005/07/04 11:29:51 [ssh_config.5] fix Xr and a little grammar; --- ChangeLog | 3 +++ ssh_config.5 | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c26a7a2..616a315f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding their own. ok dtucker@ "put it in" deraadt@ + - jmc@cvs.openbsd.org 2005/07/04 11:29:51 + [ssh_config.5] + fix Xr and a little grammar; 20050626 - (djm) OpenBSD CVS Sync diff --git a/ssh_config.5 b/ssh_config.5 index 40774297..2b2b1436 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.58 2005/07/04 00:58:43 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.59 2005/07/04 11:29:51 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -280,10 +280,10 @@ can not be opened, will continue without connecting to a master instance. .Pp X11 and -.Xr ssh-agent 4 +.Xr ssh-agent 1 forwarding is supported over these multiplexed connections, however the display and agent fowarded will be the one belonging to the master -connection. I.e. it is not possible to forward multiple displays or agents. +connection i.e. it is not possible to forward multiple displays or agents. .Pp Two additional options allow for opportunistic multiplexing: try to use a master connection but fall back to creating a new one if one does not already -- 2.45.2