r25113 - in /desktop/unstable/gdm3/debian: changelog patches/03_ipv6.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 10 23:33:51 2010
New Revision: 25113

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25113
Log:
  investigating! Fix an allocation error that leads to passing garbage 
  as addresses.
  Add to that a stripping of ::ffff: from IPv4 mapped addresses, since 
  this is not understood in $DISPLAY.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/03_ipv6.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25113&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Fri Sep 10 23:33:51 2010
@@ -1,7 +1,10 @@
 gdm3 (2.30.5-2) UNRELEASED; urgency=low
 
   * 03_ipv6.patch: new patch from Julien Cristau, thanks a lot for 
-    investigating! Hopefully fixes XDMCP support with IPv6 enabled.
+    investigating! Fix an allocation error that leads to passing garbage 
+    as addresses.
+    Add to that a stripping of ::ffff: from IPv4 mapped addresses, since 
+    this is not understood in $DISPLAY.
     Closes: #579033.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 10 Sep 2010 21:48:36 +0200

Modified: desktop/unstable/gdm3/debian/patches/03_ipv6.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/03_ipv6.patch?rev=25113&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/03_ipv6.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/03_ipv6.patch [utf-8] Fri Sep 10 23:33:51 2010
@@ -24,3 +24,28 @@
  
          res = XdmcpFill (widget->priv->socket_fd, &buf, (XdmcpNetaddr)&clnt_ss, &ss_len);
          if G_UNLIKELY (! res) {
+Index: gdm-2.30.5/common/gdm-address.c
+===================================================================
+--- gdm-2.30.5.orig/common/gdm-address.c	2010-09-11 01:20:43.646556991 +0200
++++ gdm-2.30.5/common/gdm-address.c	2010-09-11 01:28:08.458051126 +0200
+@@ -330,10 +330,18 @@ gdm_address_get_numeric_info (GdmAddress
+         }
+ 
+         if (servp != NULL) {
+-                *servp = g_strdup (serv);
++                if (g_str_has_prefix (serv, "::ffff:")) {
++                        *servp = g_strdup (serv + 7);
++                } else {
++                        *servp = g_strdup (serv);
++                }
+         }
+         if (hostp != NULL) {
+-                *hostp = g_strdup (host);
++                if (g_str_has_prefix (host, "::ffff:")) {
++                        *hostp = g_strdup (host + 7);
++                } else {
++                        *hostp = g_strdup (host);
++                }
+         }
+ 
+         return ret;