rpms/gdm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- After discussion with X team, turn tcp connections off by default, but

Browse Source 
add back option to toggle on (bug 446672)
This commit is contained in:
Ray Strode 2008-06-25 15:46:01 +00:00
parent e98370225b
commit 6745e3d36e
2 changed files with 64 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gdm-2.22.0-enable-tcp.patch
View File

@ -1,12 +1,60 @@
diff -up gdm-2.22.0/daemon/gdm-server.c.enable-tcp gdm-2.22.0/daemon/gdm-server.c diff -up gdm-2.22.0/common/gdm-settings-keys.h.enable-tcp gdm-2.22.0/common/gdm-settings-keys.h
--- gdm-2.22.0/daemon/gdm-server.c.enable-tcp 2008-06-25 10:03:11.000000000 -0400 --- gdm-2.22.0/common/gdm-settings-keys.h.enable-tcp 2008-04-17 23:29:27.000000000 -0400
+++ gdm-2.22.0/daemon/gdm-server.c 2008-06-25 10:03:14.000000000 -0400 +++ gdm-2.22.0/common/gdm-settings-keys.h 2008-06-25 11:19:51.000000000 -0400
@@ -916,7 +916,7 @@ gdm_server_class_init (GdmServerClass *k @@ -31,6 +31,8 @@ G_BEGIN_DECLS
g_param_spec_boolean ("disable-tcp", #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
NULL, #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
NULL,
- TRUE,
+ FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
} +#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 -up gdm-2.22.0/daemon/gdm-simple-slave.c.enable-tcp gdm-2.22.0/daemon/gdm-simple-slave.c
--- gdm-2.22.0/daemon/gdm-simple-slave.c.enable-tcp 2008-06-25 11:19:51.000000000 -0400
+++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-06-25 11:29:44.000000000 -0400
@@ -1003,8 +1003,18 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
* 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 -up gdm-2.22.0/data/gdm.conf-custom.in.enable-tcp gdm-2.22.0/data/gdm.conf-custom.in
--- gdm-2.22.0/data/gdm.conf-custom.in.enable-tcp 2008-04-17 23:29:29.000000000 -0400
+++ gdm-2.22.0/data/gdm.conf-custom.in 2008-06-25 11:19:51.000000000 -0400
@@ -4,4 +4,6 @@
[chooser]
+[security]
+
[debug]
diff -up gdm-2.22.0/data/gdm.schemas.in.enable-tcp gdm-2.22.0/data/gdm.schemas.in
--- gdm-2.22.0/data/gdm.schemas.in.enable-tcp 2008-04-20 09:51:56.000000000 -0400
+++ gdm-2.22.0/data/gdm.schemas.in 2008-06-25 11:19:51.000000000 -0400
@@ -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>

6
gdm.spec
View File

@ -15,7 +15,7 @@
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
Name: gdm Name: gdm
Version: 2.22.0 Version: 2.22.0
Release: 7%{?dist} Release: 8%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: User Interface/X Group: User Interface/X
@ -308,6 +308,10 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog %changelog
* Wed Jun 25 2008 Ray Strode <rstrode@redhat.com> - 1:2.22.0-8
- After discussion with X team, turn tcp connections off by default,
but add back option to toggle on (bug 446672)
* Wed Jun 25 2008 Ray Strode <rstrode@redhat.com> - 1:2.22.0-7 * Wed Jun 25 2008 Ray Strode <rstrode@redhat.com> - 1:2.22.0-7
- enable tcp connections by default - enable tcp connections by default