gdm r6275 - in trunk: . common daemon data

[halfline svn gnome org]

Author: halfline
Date: Wed Jun 25 20:34:22 2008
New Revision: 6275
URL: http://svn.gnome.org/viewvc/gdm?rev=6275&view=rev

Log:
2008-06-25  Ray Strode  <rstrode redhat com>

	By popular demand, add DisallowTCP back.

	* common/gdm-settings-keys.h:
	* data/gdm.schemas.in.in:
	* data/gdm.conf-custom.in
	Add new setting security/DisallowTCP
	* daemon/gdm-simple-slave.c (gdm_simple_slave_run):
	If DisallowTCP is false, then don't pass -nolisten tcp to X


Modified:
   trunk/ChangeLog
   trunk/common/gdm-settings-keys.h
   trunk/daemon/gdm-simple-slave.c
   trunk/data/gdm.conf-custom.in
   trunk/data/gdm.schemas.in.in

Modified: trunk/common/gdm-settings-keys.h
==============================================================================
--- trunk/common/gdm-settings-keys.h	(original)
+++ trunk/common/gdm-settings-keys.h	Wed Jun 25 20:34:22 2008
@@ -31,6 +31,8 @@
 #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
 #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
 
+#define GDM_KEY_DISALLOW_TCP "security/DisallowTCP"
+
 #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
 #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
 #define GDM_KEY_MAX_SESSIONS "xdmcp/MaxSessions"

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Wed Jun 25 20:34:22 2008
@@ -1018,8 +1018,18 @@
          * exist */
         if (display_is_local) {
                 gboolean res;
+                gboolean disable_tcp;
 
                 slave->priv->server = gdm_server_new (display_name, auth_file);
+
+                disable_tcp = TRUE;
+                if (gdm_settings_client_get_boolean (GDM_KEY_DISALLOW_TCP,
+                                                     &disable_tcp)) {
+                        g_object_set (slave->priv->server,
+                                      "disable-tcp", disable_tcp,
+                                      NULL);
+                }
+
                 g_signal_connect (slave->priv->server,
                                   "exited",
                                   G_CALLBACK (on_server_exited),

Modified: trunk/data/gdm.conf-custom.in
==============================================================================
--- trunk/data/gdm.conf-custom.in	(original)
+++ trunk/data/gdm.conf-custom.in	Wed Jun 25 20:34:22 2008
@@ -4,4 +4,6 @@
 
 [chooser]
 
+[security]
+
 [debug]

Modified: trunk/data/gdm.schemas.in.in
==============================================================================
--- trunk/data/gdm.schemas.in.in	(original)
+++ trunk/data/gdm.schemas.in.in	Wed Jun 25 20:34:22 2008
@@ -28,6 +28,12 @@
     </schema>
 
     <schema>
+      <key>security/DisallowTCP</key>
+      <signature>b</signature>
+      <default>true</default>
+    </schema>
+
+    <schema>
       <key>xdmcp/Enable</key>
       <signature>b</signature>
       <default>false</default>