Move call to get GDM_KEY_SYSTEM_MENU until after authentication check.

2006-09-11  Brian Cameron  <brian.cameron@sun.com>

        * daemon/gdm.c: Move call to get GDM_KEY_SYSTEM_MENU
          until after authentication check.  Fixes bug
          #352838.  Patch by Frederic Crozat
          <fcrozat@mandriva.com>.
        * docs/C/gdm.xml: Make gdmdynamic section a bit more
          clear.

5 files changed, 91 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index daf6e866..15ac93e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-11  Brian Cameron  <brian.cameron@sun.com>
+
+	* daemon/gdm.c: Move call to get GDM_KEY_SYSTEM_MENU
+	  until after authentication check.  Fixes bug
+	  #352838.  Patch by Frederic Crozat
+	  <fcrozat@mandriva.com>.
+	* docs/C/gdm.xml: Make gdmdynamic section a bit more
+	  clear.
+
 2006-09-04  Brian Cameron  <brian.cameron@sun.com>
 
         * Release 2.16.0:
diff --git a/daemon/gdm.c b/daemon/gdm.c
index afeab303..a78c058d 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -3275,7 +3275,6 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 		gboolean sysmenu;
 
 		disp = gdm_connection_get_display (conn);
-		sysmenu = gdm_get_value_bool_per_display (disp->name, GDM_KEY_SYSTEM_MENU);
 
 		/* Only allow locally authenticated connections */
 		if ( ! GDM_CONN_AUTHENTICATED(conn) ||
@@ -3288,6 +3287,7 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 			return;
 		}
 
+		sysmenu = gdm_get_value_bool_per_display (disp->name, GDM_KEY_SYSTEM_MENU);
 		if (strcmp (action, GDM_SUP_LOGOUT_ACTION_NONE) == 0) {
 			disp->logout_action = GDM_LOGOUT_ACTION_NONE;
 			was_ok = TRUE;
@@ -3328,7 +3328,6 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 		gboolean sysmenu;
 
 		disp = gdm_connection_get_display (conn);
-		sysmenu = gdm_get_value_bool_per_display (disp->name, GDM_KEY_SYSTEM_MENU);
 
 		/* Only allow locally authenticated connections */
 		if ( ! GDM_CONN_AUTHENTICATED(conn) ||
@@ -3341,6 +3340,7 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
 			return;
 		}
 
+		sysmenu = gdm_get_value_bool_per_display (disp->name, GDM_KEY_SYSTEM_MENU);
 		if (strcmp (action, GDM_SUP_LOGOUT_ACTION_NONE) == 0) {
 			safe_logout_action = GDM_LOGOUT_ACTION_NONE;
 			was_ok = TRUE;
diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 0350e7a6..3d93f89b 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -4308,6 +4308,7 @@ FLEXI_XNEST
 FLEXI_XSERVER
 GET_CONFIG
 GET_CONFIG_FILE
+GET_CUSTOM_CONFIG_FILE
 GET_SERVER_LIST
 GET_SERVER_DETAILS
 GREETERPIDS
@@ -4402,7 +4403,7 @@ Answers:
   vt, it lists the parent display in standard form.
 
   ERROR &lt;err number&gt; &lt;english error description&gt;
-     1 = Not implemented
+     0 = Not implemented
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -4612,7 +4613,6 @@ Answers:
   ERROR &lt;err number&gt; &lt;english error description&gt;
      0 = Not implemented
      1 = No servers found
-     50 = Unsupported key
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -5118,21 +5118,21 @@ Answers:
         </para>
 
         <para>
-        Some environments need the ability to tell GDM to create and manage new
-        displays on the fly, where it is not possible to list the possible
-        displays in GDM configuration files. The <command>gdmdynamic</command>
-        command can be used to create a new display on a particular display
-        number, run all newly created displays, or remove a display. The
-        <command>gdmdynamic</command> command can also be used to list all
-        attached displays, or only attached displays that match a pattern.
+        <command>gdmdynamic</command> allows the management of displays in a
+        dynamic fashion.  It is typically used in environments where it is not
+        possible to list the possible displays in the GDM configuration files.
+        The <command>gdmdynamic</command> command can be used to create a new
+        display on a particular display number, run all newly created displays,
+        or remove a display.  The <command>gdmdynamic</command> command can also
+        be used to list all attached displays, or only attached displays that
+        match a pattern.
+        </para>
+
+        <para>
         This program is designed to manage multiple simultaneous requests and
-        works to avoid flooding the daemon with requests.  If the socket
+        works to avoid flooding the daemon with requests.  If the sockets
         connection is busy, it will sleep and retry a certain number of times
-        that can be tuned with the <command>-t</command> and
-        <command>-s</command> arguments.  <command>gdmdynamic</command>
-        returns 1 on normal failure, and returns 2 if it is unable to 
-        connect to the daemon.  Callers can choose to call again if a
-        return code of 2 is received.
+        that can be tuned with the -s and -t options.
         </para>
 
         <variablelist>
@@ -5151,10 +5151,15 @@ Answers:
             <term>-a display=server</term>
             <listitem>
               <para>
-              Add a new display configuration. For example,
+              Add a new display configuration, leaving it in the DISPLAY_CONFIG
+              state.  For example,
               <command>&quot;-a 2=StandardServerTwo&quot;</command>
               <command>&quot;-a 3=/usr/X11R6/bin/X -dev /dev/fb2&quot;</command>
               </para>
+              <para>
+              The display will not actually be started until the display is released
+              by calling <command>gdmdynamic</command> again with the -r option.
+              </para>
             </listitem>
           </varlistentry>
 
@@ -5181,9 +5186,9 @@ Answers:
             <term>-l [pattern]</term>
             <listitem>
               <para>
-              List displays via the ATTACHED_SERVERS command. Without a pattern
-              lists all attached displays. With a pattern will match using glob
-              characters '*', '?', and '[]'. For example:
+              List displays via the ATTACHED_SERVERS <command>gdmflexiserver</command>
+              command. Without a pattern lists all attached displays.  With a pattern
+              will match using glob characters '*', '?', and '[]'. For example:
               <command>&quot;-l Standard*&quot;</command>
               <command>&quot;-l *Xorg*&quot;</command>
               </para>
diff --git a/docs/es/gdm.xml b/docs/es/gdm.xml
index 806a88a2..0e29a97a 100644
--- a/docs/es/gdm.xml
+++ b/docs/es/gdm.xml
@@ -2734,6 +2734,7 @@ FLEXI_XNEST
 FLEXI_XSERVER
 GET_CONFIG
 GET_CONFIG_FILE
+GET_CUSTOM_CONFIG_FILE
 GET_SERVER_LIST
 GET_SERVER_DETAILS
 GREETERPIDS
@@ -2828,7 +2829,7 @@ Answers:
   vt, it lists the parent display in standard form.
 
   ERROR &lt;err number&gt; &lt;english error description&gt;
-     1 = Not implemented
+     0 = Not implemented
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -3038,7 +3039,6 @@ Answers:
   ERROR &lt;err number&gt; &lt;english error description&gt;
      0 = Not implemented
      1 = No servers found
-     50 = Unsupported key
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -3516,21 +3516,21 @@ Answers:
         </para>
 
         <para>
-        Some environments need the ability to tell GDM to create and manage new
-        displays on the fly, where it is not possible to list the possible
-        displays in GDM configuration files. The <command>gdmdynamic</command>
-        command can be used to create a new display on a particular display
-        number, run all newly created displays, or remove a display. The
-        <command>gdmdynamic</command> command can also be used to list all
-        attached displays, or only attached displays that match a pattern.
+        <command>gdmdynamic</command> allows the management of displays in a
+        dynamic fashion.  It is typically used in environments where it is not
+        possible to list the possible displays in the GDM configuration files.
+        The <command>gdmdynamic</command> command can be used to create a new
+        display on a particular display number, run all newly created displays,
+        or remove a display.  The <command>gdmdynamic</command> command can also
+        be used to list all attached displays, or only attached displays that
+        match a pattern.
+        </para>
+
+        <para>
         This program is designed to manage multiple simultaneous requests and
-        works to avoid flooding the daemon with requests.  If the socket
+        works to avoid flooding the daemon with requests.  If the sockets
         connection is busy, it will sleep and retry a certain number of times
-        that can be tuned with the <command>-t</command> and
-        <command>-s</command> arguments.  <command>gdmdynamic</command>
-        returns 1 on normal failure, and returns 2 if it is unable to 
-        connect to the daemon.  Callers can choose to call again if a
-        return code of 2 is received.
+        that can be tuned with the -s and -t options.
         </para>
 
         <variablelist>
@@ -3547,10 +3547,15 @@ Answers:
             <term>-a display=server</term>
             <listitem>
               <para>
-              Add a new display configuration. For example,
+              Add a new display configuration, leaving it in the DISPLAY_CONFIG
+              state.  For example,
               <command>"-a 2=StandardServerTwo"</command>
               <command>"-a 3=/usr/X11R6/bin/X -dev /dev/fb2"</command>
               </para>
+              <para>
+              The display will not actually be started until the display is released
+              by calling <command>gdmdynamic</command> again with the -r option.
+              </para>
             </listitem>
           </varlistentry>
 
@@ -3577,9 +3582,9 @@ Answers:
             <term>-l [pattern]</term>
             <listitem>
               <para>
-              List displays via the ATTACHED_SERVERS command. Without a pattern
-              lists all attached displays. With a pattern will match using glob
-              characters '*', '?', and '[]'. For example:
+              List displays via the ATTACHED_SERVERS <command>gdmflexiserver</command>
+              command. Without a pattern lists all attached displays.  With a pattern
+              will match using glob characters '*', '?', and '[]'. For example:
               <command>"-l Standard*"</command>
               <command>"-l *Xorg*"</command>
               </para>
diff --git a/docs/uk/gdm.xml b/docs/uk/gdm.xml
index d901d765..ffc7253f 100644
--- a/docs/uk/gdm.xml
+++ b/docs/uk/gdm.xml
@@ -2781,6 +2781,7 @@ FLEXI_XNEST
 FLEXI_XSERVER
 GET_CONFIG
 GET_CONFIG_FILE
+GET_CUSTOM_CONFIG_FILE
 GET_SERVER_LIST
 GET_SERVER_DETAILS
 GREETERPIDS
@@ -2872,7 +2873,7 @@ Answers:
   vt, it lists the parent display in standard form.
 
   ERROR &lt;err number&gt; &lt;english error description&gt;
-     1 = Not implemented
+     0 = Not implemented
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -3080,7 +3081,6 @@ Answers:
   ERROR &lt;err number&gt; &lt;english error description&gt;
      0 = Not implemented
      1 = No servers found
-     50 = Unsupported key
      200 = Too many messages
      999 = Unknown error
 </screen>
@@ -3562,21 +3562,21 @@ Answers:
         </para>
 
         <para>
-        Some environments need the ability to tell GDM to create and manage new
-        displays on the fly, where it is not possible to list the possible
-        displays in GDM configuration files. The <command>gdmdynamic</command>
-        command can be used to create a new display on a particular display
-        number, run all newly created displays, or remove a display. The
-        <command>gdmdynamic</command> command can also be used to list all
-        attached displays, or only attached displays that match a pattern.
+        <command>gdmdynamic</command> allows the management of displays in a
+        dynamic fashion.  It is typically used in environments where it is not
+        possible to list the possible displays in the GDM configuration files.
+        The <command>gdmdynamic</command> command can be used to create a new
+        display on a particular display number, run all newly created displays,
+        or remove a display.  The <command>gdmdynamic</command> command can also
+        be used to list all attached displays, or only attached displays that
+        match a pattern.
+        </para>
+
+        <para>
         This program is designed to manage multiple simultaneous requests and
-        works to avoid flooding the daemon with requests.  If the socket
+        works to avoid flooding the daemon with requests.  If the sockets
         connection is busy, it will sleep and retry a certain number of times
-        that can be tuned with the <command>-t</command> and
-        <command>-s</command> arguments.  <command>gdmdynamic</command>
-        returns 1 on normal failure, and returns 2 if it is unable to 
-        connect to the daemon.  Callers can choose to call again if a
-        return code of 2 is received.
+        that can be tuned with the -s and -t options.
         </para>
 
         <variablelist>
@@ -3592,7 +3592,16 @@ Answers:
           <varlistentry>
             <term>-a display=сервер</term>
             <listitem>
-              <para>Додати нову конфігурацію дисплею. Наприклад, <command>"-a 2=StandardServerTwo"</command><command>"-a 3=/usr/X11R6/bin/X -dev /dev/fb2"</command></para>
+              <para>
+              Add a new display configuration, leaving it in the DISPLAY_CONFIG
+              state.  For example,
+              <command>"-a 2=StandardServerTwo"</command>
+              <command>"-a 3=/usr/X11R6/bin/X -dev /dev/fb2"</command>
+              </para>
+              <para>
+              The display will not actually be started until the display is released
+              by calling <command>gdmdynamic</command> again with the -r option.
+              </para>
             </listitem>
           </varlistentry>
 
@@ -3613,7 +3622,13 @@ Answers:
           <varlistentry>
             <term>-l [шаблон]</term>
             <listitem>
-              <para>Отримати перелік дисплеїв командою ATTACHED_SERVERS. Без шаблону виводиться список усіх приєднаних дисплеїв. У шаблоні можуть використовуватись метасимволи '*', '?', та '[]'. Наприклад: <command>"-l Standard*"</command><command>"-l *Xorg*"</command></para>
+              <para>
+              List displays via the ATTACHED_SERVERS <command>gdmflexiserver</command>
+              command. Without a pattern lists all attached displays.  With a pattern
+              will match using glob characters '*', '?', and '[]'. For example:
+              <command>"-l Standard*"</command>
+              <command>"-l *Xorg*"</command>
+              </para>
             </listitem>
           </varlistentry>