Attachment 330013 Details for Bug 546632

[patch] Fix for kdm

xdmcp.ipv6-ipv4.patch (text/plain), 1.64 KB, created by Christoph Bartoschek on 2009-11-30 13:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Bartoschek

Created: 2009-11-30 13:04:22 UTC

Size: 1.64 KB

patch

obsolete

>Index: xdmcp.c
>===================================================================
>--- xdmcp.c	(Revision 1055901)
>+++ xdmcp.c	(Arbeitskopie)
>@@ -612,14 +612,34 @@
> 				{
> 					struct sockaddr_in6 in6_addr;
> 
>-					if (clientAddress.length != 16 || clientPort.length != 2)
>+					if ((clientAddress.length != 16 && clientAddress.length != 4) || 
>+                                            clientPort.length != 2)
>+                                        {
> 						goto badAddress;
>+					}
> 					bzero( &in6_addr, sizeof(in6_addr) );
> #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
> 					in6_addr.sin6_len = sizeof(in6_addr);
> #endif
> 					in6_addr.sin6_family = AF_INET6;
>-					memmove( &in6_addr,clientAddress.data,clientAddress.length );
>+                                        if (clientAddress.length == 16) {
>+						memmove( in6_addr.sin6_addr.s6_addr, clientAddress.data, 16 );
>+					} else {
>+						/* If the client wants to forward the xdm server to an
>+						   ipv4 hosts it sends an ipv4 address in the forward
>+						   packet. On dual-stack hosts the packet arrives as a
>+						   ipv6 packet. To respond to the ipv4 host one has
>+						   to create an ipv4-mapped address of the form:
>+						   
>+						   ::ffff:xxx.xxx.xxx.xxx
>+
>+						   One example where this is necessary is an ipv4-only
>+						   thin client that connects to a dual-stacked xdm.
>+						*/
>+						in6_addr.sin6_addr.s6_addr[10] = 0xff;
>+						in6_addr.sin6_addr.s6_addr[11] = 0xff;
>+						memmove( in6_addr.sin6_addr.s6_addr + 12, clientAddress.data, 4 );
>+					}
> 					memmove( &in6_addr.sin6_port, clientPort.data, 2 );
> 					client = (struct sockaddr *)&in6_addr;
> 					clientlen = sizeof(in6_addr);

Actions: View | Diff

Attachments on bug 546632: 323399 | 324018 | 324019 | 330012 | 330013