From 7121507b19b7e634c3f5aecbd5beb68690e4ca35 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 17 May 2001 03:16:18 +0000 Subject: - deraadt@cvs.openbsd.org 2001/05/15 22:04:01 [ssh.1] X11 forwarding details improved --- ChangeLog | 5 ++++- ssh.1 | 13 +++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19e66029a..857139117 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ - markus@cvs.openbsd.org 2001/05/12 19:53:13 [sftp-server.c] readlink does not NULL-terminate; mhe@home.se + - deraadt@cvs.openbsd.org 2001/05/15 22:04:01 + [ssh.1] + X11 forwarding details improved 20010512 - OpenBSD CVS Sync @@ -5408,4 +5411,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1219 2001/05/17 03:14:57 mouring Exp $ +$Id: ChangeLog,v 1.1220 2001/05/17 03:16:18 mouring Exp $ diff --git a/ssh.1 b/ssh.1 index d93b114c6..39991a5c6 100644 --- a/ssh.1 +++ b/ssh.1 @@ -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.1,v 1.109 2001/05/04 14:21:55 stevesk Exp $ +.\" $OpenBSD: ssh.1,v 1.110 2001/05/15 22:04:01 deraadt Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -304,7 +304,16 @@ and if the peer supports it) .Pp .Ss X11 and TCP forwarding .Pp -If the user is using X11 (the +If the +.Cm ForwardX11 +variable is set to +.Dq yes +(or, see the description of the +.Fl X +and +.Fl x +options described later) +and the user is using X11 (the .Ev DISPLAY environment variable is set), the connection to the X11 display is automatically forwarded to the remote side in such a way that any X11 -- cgit v1.2.3