r23161 - in /desktop/unstable/gdm/debian: changelog patches/02_xdmcp-ipv6_bindv6only.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 28 13:03:11 2010
New Revision: 23161

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23161
Log:
02_xdmcp-ipv6_bindv6only.patch: patch from Julien Cristau. Allow 
xdmcp to work with net.ipv6.bindv6only=1. Closes: #563406.

Added:
    desktop/unstable/gdm/debian/patches/02_xdmcp-ipv6_bindv6only.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/patches/series

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=23161&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm/debian/changelog [utf-8] Sun Feb 28 13:03:11 2010
@@ -15,6 +15,8 @@
   * 61_console_tty0.patch: patch from Julien Cristau. The console device 
     is /dev/tty0 for the physical console, not /dev/console.
     Closes: #348033.
+  * 02_xdmcp-ipv6_bindv6only.patch: patch from Julien Cristau. Allow 
+    xdmcp to work with net.ipv6.bindv6only=1. Closes: #563406.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Dec 2009 21:59:58 +0100
 

Added: desktop/unstable/gdm/debian/patches/02_xdmcp-ipv6_bindv6only.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/02_xdmcp-ipv6_bindv6only.patch?rev=23161&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/02_xdmcp-ipv6_bindv6only.patch (added)
+++ desktop/unstable/gdm/debian/patches/02_xdmcp-ipv6_bindv6only.patch [utf-8] Sun Feb 28 13:03:11 2010
@@ -1,0 +1,29 @@
+Debian #563406
+
+Index: gdm-2.20.10/daemon/gdm-xdmcp-manager.c
+===================================================================
+--- gdm-2.20.10.orig/daemon/gdm-xdmcp-manager.c	2010-02-28 13:57:47.685002928 +0100
++++ gdm-2.20.10/daemon/gdm-xdmcp-manager.c	2010-02-28 14:01:54.697504018 +0100
+@@ -398,6 +398,7 @@ static int
+ create_socket (struct addrinfo *ai)
+ {
+ 	int sock;
++	int zero = 0;
+ 
+ 	sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ 	if (sock < 0) {
+@@ -405,6 +406,14 @@ create_socket (struct addrinfo *ai)
+ 		return sock;
+ 	}
+ 
++	if (ai->ai_family == AF_INET6) {
++		if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof zero) < 0) {
++			gdm_error("setsockopt(IPV6_V6ONLY): %s\n", g_strerror(errno));
++			close(sock);
++			return -1;
++		}
++	}
++
+ 	if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+ 		gdm_error ("bind: %s", g_strerror (errno));
+ 		close (sock);

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=23161&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm/debian/patches/series [utf-8] Sun Feb 28 13:03:11 2010
@@ -1,4 +1,5 @@
 01_gdmchooser-ipv6_bindv6only-workaround.patch
+02_xdmcp-ipv6_bindv6only.patch
 20_xdm-stuff.patch
 21_XKeepsCrashing_bashism.patch
 35_gdm.conf.patch