rpms/gdm/devel gdm-2.22.0-enable-tcp.patch, 1.1, 1.2 gdm.spec, 1.392, 1.393
Ray Strode (rstrode)
fedora-extras-commits at redhat.com
Wed Jun 25 15:46:54 UTC 2008
- Previous message: rpms/kernel/devel patch-2.6.26-rc8.bz2.sign, NONE, 1.1 .cvsignore, 1.845, 1.846 kernel.spec, 1.713, 1.714 sources, 1.806, 1.807 upstream, 1.724, 1.725 patch-2.6.26-rc7-git2.bz2.sign, 1.1, NONE
- Next message: rpms/libprelude/devel libprelude.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3686
Modified Files:
gdm-2.22.0-enable-tcp.patch gdm.spec
Log Message:
- After discussion with X team, turn tcp connections off by default,
but add back option to toggle on (bug 446672)
gdm-2.22.0-enable-tcp.patch:
Index: gdm-2.22.0-enable-tcp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.22.0-enable-tcp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.22.0-enable-tcp.patch 25 Jun 2008 14:23:06 -0000 1.1
+++ gdm-2.22.0-enable-tcp.patch 25 Jun 2008 15:46:01 -0000 1.2
@@ -1,12 +1,60 @@
-diff -up gdm-2.22.0/daemon/gdm-server.c.enable-tcp gdm-2.22.0/daemon/gdm-server.c
---- gdm-2.22.0/daemon/gdm-server.c.enable-tcp 2008-06-25 10:03:11.000000000 -0400
-+++ gdm-2.22.0/daemon/gdm-server.c 2008-06-25 10:03:14.000000000 -0400
-@@ -916,7 +916,7 @@ gdm_server_class_init (GdmServerClass *k
- g_param_spec_boolean ("disable-tcp",
- NULL,
- NULL,
-- TRUE,
-+ FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+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/common/gdm-settings-keys.h.enable-tcp 2008-04-17 23:29:27.000000000 -0400
++++ gdm-2.22.0/common/gdm-settings-keys.h 2008-06-25 11:19:51.000000000 -0400
+@@ -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 -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>
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- gdm.spec 25 Jun 2008 14:13:17 -0000 1.392
+++ gdm.spec 25 Jun 2008 15:46:01 -0000 1.393
@@ -15,7 +15,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 2.22.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -308,6 +308,10 @@
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog
+* Wed Jun 25 2008 Ray Strode <rstrode at 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 at redhat.com> - 1:2.22.0-7
- enable tcp connections by default
- Previous message: rpms/kernel/devel patch-2.6.26-rc8.bz2.sign, NONE, 1.1 .cvsignore, 1.845, 1.846 kernel.spec, 1.713, 1.714 sources, 1.806, 1.807 upstream, 1.724, 1.725 patch-2.6.26-rc7-git2.bz2.sign, 1.1, NONE
- Next message: rpms/libprelude/devel libprelude.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list