r24532 - in /desktop/unstable/gdm3/debian: changelog patches/25_xdmcpfill_length.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jun 17 05:47:21 2010
New Revision: 24532

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24532
Log:
25_xdmcpfill_length.patch: stolen upstream. Correctly initialize 
XdmcpFill. Hopefully closes #579033 but there are probably IPv6 
issues remaining.

Added:
    desktop/unstable/gdm3/debian/patches/25_xdmcpfill_length.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24532&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Thu Jun 17 05:47:21 2010
@@ -2,6 +2,9 @@
 
   * greeter.gconf-defaults: disable the power management icon, it allows 
     to change the power management settings. Closes: #580629.
+  * 25_xdmcpfill_length.patch: stolen upstream. Correctly initialize 
+    XdmcpFill. Hopefully closes #579033 but there are probably IPv6 
+    issues remaining.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 12 Jun 2010 15:26:51 +0200
 

Added: desktop/unstable/gdm3/debian/patches/25_xdmcpfill_length.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/25_xdmcpfill_length.patch?rev=24532&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/25_xdmcpfill_length.patch (added)
+++ desktop/unstable/gdm3/debian/patches/25_xdmcpfill_length.patch [utf-8] Thu Jun 17 05:47:21 2010
@@ -1,0 +1,34 @@
+From 34a3c576fd7a15721765a43939f44978a93d43f9 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 16 Jun 2010 16:33:20 +0000
+Subject: Call XdmcpFill with properly initialized length
+
+commit e533f4b72568cdc3d7f7ec6cec09d9392b11d54c cleaned
+up various XDMCP issues, but it unfortunately also created
+a bug making XDMCP fail a high percentage of the time.
+
+XdmcpFill takes an in-out length argument.  This argument was getting
+passed an uninitialized variable.
+(cherry picked from commit 86ac166294f0fc8f662031167066acf1928cf139)
+---
+diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
+index 447833d..791bba3 100644
+--- a/daemon/gdm-xdmcp-display-factory.c
++++ b/daemon/gdm-xdmcp-display-factory.c
+@@ -2879,12 +2879,13 @@ decode_packet (GIOChannel             *source,
+                 return TRUE;
+         }
+ 
++        ss_len = (int)gdm_sockaddr_len (&clnt_ss);
++
+         res = XdmcpFill (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)&clnt_ss, &ss_len);
+         if G_UNLIKELY (! res) {
+                 g_debug ("GdmXdmcpDisplayFactory: Could not create XDMCP buffer!");
+                 return TRUE;
+         }
+-        ss_len = (int)gdm_sockaddr_len (&clnt_ss);
+ 
+         res = XdmcpReadHeader (&factory->priv->buf, &header);
+         if G_UNLIKELY (! res) {
+--
+cgit v0.8.3.1

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24532&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Thu Jun 17 05:47:21 2010
@@ -24,4 +24,5 @@
 22_noconsole.patch
 23_autologin_once.patch
 24_show_user_other.patch
+25_xdmcpfill_length.patch
 90_relibtoolize.patch