Enable XDMCP configuration so it works. Previously only xdmcp/Enable was

2009-02-17 Brian Cameron <brian.cameron@sun.com>

        * common/gdm-settings-direct.[ch], common/gdm-settings-keys.h,
        daemon/gdm-simple-slave.c, daemon/gdm-xdmcp-chooser-slave.c,
        daemon/gdm-xdmcp-display-factory.c, data/gdm.schemas.in.in,
        docs/C/gdm.xml: Enable XDMCP configuration so it works.  Previously
        only xdmcp/Enable was being used in the code.  Also add support for
        chooser/Multicast and chooser/MulticastAddr configuration options.
        Now set the default values of MAX_DISPLAY_PER_HOST to 1 and MAX_WAIT to
        30 as specified in the docs.  Add a gdm_settings_direct_get_uint
        function to get unsigned integer configuration values more cleanly
        without the need to cast.  Fixes bug #569876.

svn path=/trunk/; revision=6715

1 files changed, 36 insertions, 83 deletions

diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 8f160ee5..4d9939cc 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -1106,6 +1106,34 @@ TimedLogin=you
         A full list of supported configuration keys follow:
       </para>
 
+      <sect3 id="choosersection">
+        <title>[chooser]</title>
+        <variablelist>
+
+          <varlistentry>
+            <term>Multicast</term>
+            <listitem>
+              <synopsis>Multicast=false</synopsis>
+              <para>
+                If true and IPv6 is enabled, the chooser will send a multicast
+                query to the local network and collect responses from the hosts
+                who have joined multicast group.
+              </para>
+            </listitem>
+          </varlistentry>
+         
+          <varlistentry>
+            <term>MulticastAddr</term>
+            <listitem>
+              <synopsis>MulticastAddr=ff02::1</synopsis>
+              <para>
+                This is the Link-local Multicast address.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect3>
+
       <sect3 id="daemonsection">
         <title>[daemon]</title>
         <variablelist>
@@ -1175,8 +1203,9 @@ TimedLogin=you
             <listitem>
               <synopsis>AutomaticLoginEnable=false</synopsis>
               <para>
-                If true, the user given in <filename>AutomaticLogin</filename> should be
-                logged in immediately. This feature is like timed login with a delay of 0.
+                If true, the user given in <filename>AutomaticLogin</filename>
+                should be logged in immediately. This feature is like timed
+                login with a delay of 0.
               </para>
             </listitem>
           </varlistentry>
@@ -1293,31 +1322,6 @@ gdm:.my.domain
           </varlistentry>
           
           <varlistentry>
-            <term>EnableProxy</term>
-            <listitem>
-              <synopsis>EnableProxy=false</synopsis>
-              <para>
-                Setting this to true enables support for running XDMCP sessions
-                on a local proxy Xserver. This may improve the performance of
-                XDMCP sessions, especially on high latency networks, as many
-                X protocol operations can be completed without going over the
-                network.
-              </para>
-
-              <para>
-                Note, however, that this mode will significantly increase the
-                burden on the machine hosting the XDMCP sessions
-              </para>
-
-              <para>
-                See the <filename>FlexiProxy</filename> and
-                <filename>FlexiProxyDisconnect</filename> options for further
-                details on how to configure support for this feature.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
             <term>HonorIndirect</term>
             <listitem>
               <synopsis>HonorIndirect=true</synopsis>
@@ -1348,19 +1352,6 @@ gdm:.my.domain
           </varlistentry>
           
           <varlistentry>
-            <term>MaxPendingIndirect</term>
-            <listitem>
-              <synopsis>MaxPendingIndirect=4</synopsis>
-              <para>
-                GDM will only provide <filename>MaxPendingIndirect</filename>
-                displays with host choosers simultaneously.  If more queries
-                from different hosts come in, the oldest ones will be
-                forgotten.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
             <term>MaxSessions</term>
             <listitem>
               <synopsis>MaxSessions=16</synopsis>
@@ -1413,18 +1404,6 @@ gdm:.my.domain
           </varlistentry>
         
           <varlistentry>
-            <term>Port</term>
-            <listitem>
-              <synopsis>Port=177</synopsis>
-              <para>
-                The UDP port number <filename>gdm</filename> should listen to
-                for XDMCP requests. Do not change this unless you know what
-                you are doing.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
             <term>PingIntervalSeconds</term>
             <listitem>
               <synopsis>PingIntervalSeconds=15</synopsis>
@@ -1449,44 +1428,18 @@ gdm:.my.domain
           </varlistentry>
 
           <varlistentry>
-            <term>ProxyReconnect</term>
+            <term>Port</term>
             <listitem>
-              <synopsis>FlexiProxyReconnect=</synopsis>
-              <para>
-                Setting this option enables experimental support for session
-                migration with XDMCP sessions. This enables users to disconnect
-                from their session and later reconnect to that same session,
-                possibly from a different terminal.
-              </para>
-
-              <para>
-                In order to use this feature, you must have a nested Xserver
-                available which supports disconnecting from its parent Xserver
-                and reconnecting to another Xserver. Currently, the Distributed
-                Multihead X (DMX) server supports this feature to some extent
-                and other projects like NoMachine NX are busy implementing it.
-              </para>
-
+              <synopsis>Port=177</synopsis>
               <para>
-                This option should be set to the path of a command which will
-                handle reconnecting the XDMCP proxy to another backend display.
-                A sample implementation for use with DMX is supplied.
+                The UDP port number <filename>gdm</filename> should listen to
+                for XDMCP requests. Do not change this unless you know what
+                you are doing.
               </para>
             </listitem>
           </varlistentry>
 
           <varlistentry>
-            <term>ProxyXServer</term>
-            <listitem>
-              <synopsis>ProxyXServer=</synopsis>
-              <para>
-                The Xserver command line for a XDMCP proxy. Any nested X
-                server like Xnest, Xephyr or Xdmx should work fairly well.
-              </para>
-            </listitem>
-          </varlistentry>
- 
-          <varlistentry>
             <term>Willing</term>
             <listitem>
               <synopsis>Willing=&lt;etc&gt;/gdm/Xwilling</synopsis>