r24771 - in /desktop/unstable/gdm3/debian: changelog patches/26_xdmcpfill_length.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jul 16 07:41:04 2010
New Revision: 24771

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24771
Log:
25_xdmcpfill_length.patch, 26_xdmcp_fill.patch: stolen upstream. 
Correctly initialize XdmcpFill. Closes: #579033.

Added:
    desktop/unstable/gdm3/debian/patches/26_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=24771&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Fri Jul 16 07:41:04 2010
@@ -2,9 +2,8 @@
 
   * 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.
+  * 25_xdmcpfill_length.patch, 26_xdmcp_fill.patch: stolen upstream. 
+    Correctly initialize XdmcpFill. Closes: #579033.
   * 03_authdir.patch: drop, it’s useless since we override it again with 
     a make argument.
   * Use linux-any wildcard instead of listing non-linux architectures.

Added: desktop/unstable/gdm3/debian/patches/26_xdmcpfill_length.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/26_xdmcpfill_length.patch?rev=24771&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/26_xdmcpfill_length.patch (added)
+++ desktop/unstable/gdm3/debian/patches/26_xdmcpfill_length.patch [utf-8] Fri Jul 16 07:41:04 2010
@@ -1,0 +1,31 @@
+From f7a7158efcaa3e113a02dd0f0bfdf22a253928e5 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 17 Jun 2010 15:59:36 +0000
+Subject: Call XdmcpFill with properly initialized length
+
+This is just like commit 86ac166294f0fc8f662031167066acf1928cf139,
+but in a different place in the code.
+
+Spotted by mariodebian <mariodebian at gmail.com>
+---
+diff --git a/gui/simple-chooser/gdm-host-chooser-widget.c b/gui/simple-chooser/gdm-host-chooser-widget.c
+index 0c8f46c..352c1e2 100644
+--- a/gui/simple-chooser/gdm-host-chooser-widget.c
++++ b/gui/simple-chooser/gdm-host-chooser-widget.c
+@@ -208,12 +208,13 @@ decode_packet (GIOChannel           *source,
+                 return TRUE;
+         }
+ 
++        ss_len = (int)gdm_sockaddr_len (&clnt_ss);
++
+         res = XdmcpFill (widget->priv->socket_fd, &buf, (XdmcpNetaddr)&clnt_ss, &ss_len);
+         if G_UNLIKELY (! res) {
+                 g_debug (_("XDMCP: Could not create XDMCP buffer!"));
+                 return TRUE;
+         }
+-        ss_len = (int)gdm_sockaddr_len (&clnt_ss);
+ 
+         res = XdmcpReadHeader (&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=24771&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Fri Jul 16 07:41:04 2010
@@ -24,4 +24,5 @@
 23_autologin_once.patch
 24_show_user_other.patch
 25_xdmcpfill_length.patch
+26_xdmcpfill_length.patch
 90_relibtoolize.patch