summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.113
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 @@
3 - markus@cvs.openbsd.org 2001/05/12 19:53:13 3 - markus@cvs.openbsd.org 2001/05/12 19:53:13
4 [sftp-server.c] 4 [sftp-server.c]
5 readlink does not NULL-terminate; mhe@home.se 5 readlink does not NULL-terminate; mhe@home.se
6 - deraadt@cvs.openbsd.org 2001/05/15 22:04:01
7 [ssh.1]
8 X11 forwarding details improved
6 9
720010512 1020010512
8 - OpenBSD CVS Sync 11 - OpenBSD CVS Sync
@@ -5408,4 +5411,4 @@
5408 - Wrote replacements for strlcpy and mkdtemp 5411 - Wrote replacements for strlcpy and mkdtemp
5409 - Released 1.0pre1 5412 - Released 1.0pre1
5410 5413
5411$Id: ChangeLog,v 1.1219 2001/05/17 03:14:57 mouring Exp $ 5414$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 @@
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.1,v 1.109 2001/05/04 14:21:55 stevesk Exp $ 37.\" $OpenBSD: ssh.1,v 1.110 2001/05/15 22:04:01 deraadt Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -304,7 +304,16 @@ and if the peer supports it)
304.Pp 304.Pp
305.Ss X11 and TCP forwarding 305.Ss X11 and TCP forwarding
306.Pp 306.Pp
307If the user is using X11 (the 307If the
308.Cm ForwardX11
309variable is set to
310.Dq yes
311(or, see the description of the
312.Fl X
313and
314.Fl x
315options described later)
316and the user is using X11 (the
308.Ev DISPLAY 317.Ev DISPLAY
309environment variable is set), the connection to the X11 display is 318environment variable is set), the connection to the X11 display is
310automatically forwarded to the remote side in such a way that any X11 319automatically forwarded to the remote side in such a way that any X11