summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-05-15 22:04:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-05-15 22:04:02 +0000
commitf819d86b8235c84b70729d0339aeb5bc9bb93098 (patch)
treef3c4b8c7eaee287ea6e3aacb7b158cbd633f3a7a /usr.bin
parent2ade0d317857e411c22ad064504f9f54b2ae466f (diff)
X11 forwarding details improved
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.113
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index d93b114c66c..39991a5c628 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/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