diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2010-04-21 17:43:35 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@sun.com> | 2010-04-21 17:43:35 -0500 |
| commit | 31abb34e8792c64e202508a8066e723889439b6b (patch) | |
| tree | 3afe3775f55ce2882b8b8041c70e2cdadda40b4f | |
| parent | 744557f87c84398860c102ba8f8d10790487ae32 (diff) | |
| download | gdm-31abb34e8792c64e202508a8066e723889439b6b.tar.gz | |
Increase the default timeout for PingIntervalSeconds from 15 to 60 and update
docs to highlight how this feature works, since the previous docs were
misleading. Fixes bug #606861.
| -rw-r--r-- | data/gdm.schemas.in.in | 2 | ||||
| -rw-r--r-- | docs/C/gdm.xml | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/data/gdm.schemas.in.in b/data/gdm.schemas.in.in index b077d6e1..514117d7 100644 --- a/data/gdm.schemas.in.in +++ b/data/gdm.schemas.in.in @@ -119,7 +119,7 @@ <schema> <key>xdmcp/PingIntervalSeconds</key> <signature>i</signature> - <default>15</default> + <default>60</default> </schema> <schema> <key>xdmcp/Willing</key> diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml index 87941e0e..8ad3046d 100644 --- a/docs/C/gdm.xml +++ b/docs/C/gdm.xml @@ -1528,13 +1528,14 @@ gdm:.my.domain <varlistentry> <term>PingIntervalSeconds</term> <listitem> - <synopsis>PingIntervalSeconds=15</synopsis> + <synopsis>PingIntervalSeconds=60</synopsis> <para> - Interval in which to ping the Xserver in seconds. If the - Xserver does not respond before the next time we ping it, the - connection is stopped and the session ended. This is a - combination of the XDM PingInterval and PingTimeout, but in - seconds. + If the Xserver does not respond in the specified number of + seconds, then the connection is stopped and the session ended. + When this happens the slave daemon dies with an ALARM signal. + Note that GDM 2.20 and earlier multiplied this setting by 2, + so it may be necessary to increase the timeout if upgrading + from GDM 2.20 and earlier to a newer version. </para> <para> |