diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-09-21 12:46:22 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-21 22:49:27 +1000 |
commit | b5e412a8993ad17b9e1141c78408df15d3d987e1 (patch) | |
tree | 3dc7a5be35019f5afac2d4fa1587a9befd3e7d9b /ssh_config.5 | |
parent | cb24d9fcc901429d77211f274031653476864ec6 (diff) |
upstream: Allow ssh_config ForwardX11Timeout=0 to disable the
timeout and allow X11 connections in untrusted mode indefinitely. ok dtucker@
OpenBSD-Commit-ID: ea1ceed3f540b48e5803f933e59a03b20db10c69
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 2df1165f1..27136dbd6 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,7 +33,7 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.284 2018/09/21 03:11:36 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.285 2018/09/21 12:46:22 djm Exp $ |
37 | .Dd $Mdocdate: September 21 2018 $ | 37 | .Dd $Mdocdate: September 21 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -686,6 +686,10 @@ section of | |||
686 | X11 connections received by | 686 | X11 connections received by |
687 | .Xr ssh 1 | 687 | .Xr ssh 1 |
688 | after this time will be refused. | 688 | after this time will be refused. |
689 | Setting | ||
690 | .Cm ForwardX11Timeout | ||
691 | to zero will disable the timeout and permit X11 forwarding for the life | ||
692 | of the connection. | ||
689 | The default is to disable untrusted X11 forwarding after twenty minutes has | 693 | The default is to disable untrusted X11 forwarding after twenty minutes has |
690 | elapsed. | 694 | elapsed. |
691 | .It Cm ForwardX11Trusted | 695 | .It Cm ForwardX11Trusted |