diff --git a/gdm-2.22.0-fix-xdmcp.patch b/gdm-2.22.0-fix-xdmcp.patch new file mode 100644 index 0000000..2607147 --- /dev/null +++ b/gdm-2.22.0-fix-xdmcp.patch @@ -0,0 +1,51 @@ +Bug 446224 - xdmcp broken in gdm + +"It seems gdm_manager_constructor is being called before manager->priv->xdmcp_enabled is +configured, so manager->priv->xdmcp_factory is never set. I am attaching an +illustrative patch which allows XDMCP to start listening." + +-- Patch by Michael Young + +https://bugzilla.redhat.com/show_bug.cgi?id=446224 +https://bugzilla.redhat.com/attachment.cgi?id=305955 +https://bugzilla.redhat.com/attachment.cgi?id=305245 + +diff -Nurp gdm-2.22.0.orig/daemon/gdm-display.c gdm-2.22.0/daemon/gdm-display.c +--- gdm-2.22.0.orig/daemon/gdm-display.c 2008-04-18 05:29:28.000000000 +0200 ++++ gdm-2.22.0/daemon/gdm-display.c 2008-09-23 19:29:23.000000000 +0200 +@@ -465,7 +465,7 @@ gdm_display_real_manage (GdmDisplay *dis + + g_assert (display->priv->slave_proxy == NULL); + +- if (!gdm_display_create_authority (display)) { ++ if (display->priv->access_file == NULL && !gdm_display_create_authority (display)) { + g_warning ("Unable to set up access control for display %d", + display->priv->x11_display_number); + return FALSE; +diff -Nurp gdm-2.22.0.orig/daemon/gdm-manager.c gdm-2.22.0/daemon/gdm-manager.c +--- gdm-2.22.0.orig/daemon/gdm-manager.c 2008-04-18 05:29:28.000000000 +0200 ++++ gdm-2.22.0/daemon/gdm-manager.c 2008-09-23 19:29:42.000000000 +0200 +@@ -323,9 +323,9 @@ gdm_manager_constructor (GType + + manager->priv->local_factory = gdm_local_display_factory_new (manager->priv->display_store); + +- if (manager->priv->xdmcp_enabled) { ++/* if (manager->priv->xdmcp_enabled) { */ + manager->priv->xdmcp_factory = gdm_xdmcp_display_factory_new (manager->priv->display_store); +- } ++/* } */ + + return G_OBJECT (manager); + } +diff -Nurp gdm-2.22.0.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.22.0/daemon/gdm-xdmcp-display-factory.c +--- gdm-2.22.0.orig/daemon/gdm-xdmcp-display-factory.c 2008-04-18 05:29:28.000000000 +0200 ++++ gdm-2.22.0/daemon/gdm-xdmcp-display-factory.c 2008-09-23 19:29:23.000000000 +0200 +@@ -2274,6 +2274,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla + gsize cookie_size; + char *name; + ++ gdm_display_create_authority (display); ++ + gdm_display_get_x11_cookie (display, &cookie, + &cookie_size, NULL); + diff --git a/gdm.spec b/gdm.spec index 9602645..40e128c 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.22.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -86,6 +86,8 @@ Patch5: gdm-2.22.0-fix-pam-mkhomedir.patch # https://bugzilla.redhat.com/show_bug.cgi?id=446672 Patch6: gdm-2.22.0-enable-tcp.patch Patch7: gdm-2.22.0-fix-auto-login.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=446224 +Patch8: gdm-2.22.0-fix-xdmcp.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -112,6 +114,7 @@ multiple simulanteous logged in users. %patch5 -p1 -b .fix-pam-mkhomedir %patch6 -p1 -b .enable-tcp %patch7 -p1 -b .fix-auto-login +%patch8 -p1 -b .fix-xdmcp %patch99 -p1 -b .fedora-logo %build @@ -309,6 +312,9 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Tue Sep 23 2008 Lubomir Rintel - 1:2.22.0-9 +- Fix XDMCP, thanks to Michael Young (bug 446224) + * Mon Jun 30 2008 Ray Strode - 1:2.22.0-8 - Fix automatic login option fix