diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | common/gdm-settings-keys.h | 2 | ||||
| -rw-r--r-- | daemon/gdm-simple-slave.c | 10 | ||||
| -rw-r--r-- | data/gdm.conf-custom.in | 2 | ||||
| -rw-r--r-- | data/gdm.schemas.in.in | 6 |
5 files changed, 31 insertions, 0 deletions
@@ -1,3 +1,14 @@ +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 + 2008-06-11 William Jon McCann <jmccann@redhat.com> * gui/simple-greeter/gdm-user-manager.c (get_seat_proxy): diff --git a/common/gdm-settings-keys.h b/common/gdm-settings-keys.h index 9ea57a0f..a7683bd1 100644 --- a/common/gdm-settings-keys.h +++ b/common/gdm-settings-keys.h @@ -31,6 +31,8 @@ G_BEGIN_DECLS #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" diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 59b8cf0e..b010ddfb 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -1018,8 +1018,18 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) * 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), diff --git a/data/gdm.conf-custom.in b/data/gdm.conf-custom.in index 1ea316ca..9262f58a 100644 --- a/data/gdm.conf-custom.in +++ b/data/gdm.conf-custom.in @@ -4,4 +4,6 @@ [chooser] +[security] + [debug] diff --git a/data/gdm.schemas.in.in b/data/gdm.schemas.in.in index 0f6d4115..6c508460 100644 --- a/data/gdm.schemas.in.in +++ b/data/gdm.schemas.in.in @@ -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> |