summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config.57
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 67ce8f8df..e4ec748f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 [sshd.8] 15 [sshd.8]
16 add /etc/motd and $HOME/.hushlogin to FILES; 16 add /etc/motd and $HOME/.hushlogin to FILES;
17 from michael knudsen; 17 from michael knudsen;
18 - djm@cvs.openbsd.org 2005/02/28 00:54:10
19 [ssh_config.5]
20 bz#849: document timeout on untrusted x11 forwarding sessions. Reported by
21 orion AT cora.nwra.com; ok markus@
18 22
1920050226 2320050226
20 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] 24 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
@@ -2191,4 +2195,4 @@
2191 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2195 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2192 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2196 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2193 2197
2194$Id: ChangeLog,v 1.3670 2005/03/01 10:17:09 djm Exp $ 2198$Id: ChangeLog,v 1.3671 2005/03/01 10:17:31 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 67b6ca72e..8f6d851b4 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.41 2005/01/28 18:14:09 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.42 2005/02/28 00:54:10 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
@@ -359,11 +359,16 @@ option is also enabled.
359If this option is set to 359If this option is set to
360.Dq yes 360.Dq yes
361then remote X11 clients will have full access to the original X11 display. 361then remote X11 clients will have full access to the original X11 display.
362.Pp
362If this option is set to 363If this option is set to
363.Dq no 364.Dq no
364then remote X11 clients will be considered untrusted and prevented 365then remote X11 clients will be considered untrusted and prevented
365from stealing or tampering with data belonging to trusted X11 366from stealing or tampering with data belonging to trusted X11
366clients. 367clients.
368Furthermore, the
369.Xr xauth 1
370token used for the session will be set to expire after 20 minutes.
371Remote clients will be refused access after this time.
367.Pp 372.Pp
368The default is 373The default is
369.Dq no . 374.Dq no .