Hi Keith,

Please consider applying to master.

Thanks.

On 05/03/2011 18:32, Jon TURNEY wrote:
> When XDMCP -from is specified, only register the requested address,
> rather than the requested address, and any others we have of different
> address families to the requested address.
> 
> e.g. if we have 4 interfaces with both IPv4 and IPv6 addresses (which
> are not IPv6 mapped IPV4 addresses), using -from with one of those IPv4
> addresses currently means only that IPv4 address, and all IPv6 addresses
> are used in the connection data in XDMCP REQUEST packet.
> 
> (See http://cygwin.com/ml/cygwin-xfree/2011-02/msg00000.html)

I suppose I should add that it's not 100% clear to me  from reading 'man
Xserver' what -from is actually supposed to do. If it means "only bind to and
advertise the specified address", then this is a bug-fix.
>From 1417c8995eee8287da1df8572e88202258f76613 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <[email protected]>
Date: Thu, 10 Feb 2011 22:51:20 +0000
Subject: [PATCH] When XDMCP -from is specified, only register the requested 
address

When XDMCP -from is specified, only register the requested address,
rather than the requested address, and any others we have of different
address families to the requested address.

e.g. if we have 4 interfaces with both IPv4 and IPv6 addresses (which
are not IPv6 mapped IPV4 addresses), using -from with one of those IPv4
addresses currently means only that IPv4 address, and all IPv6 addresses
are used in the connection data in XDMCP REQUEST packet.

(See http://cygwin.com/ml/cygwin-xfree/2011-02/msg00000.html)

Signed-off-by: Jon TURNEY <[email protected]>
Reviewed-by: Alan Coopersmith <[email protected]>
---
 os/xdmcp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/os/xdmcp.c b/os/xdmcp.c
index 877b11c..f5331e1 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -486,7 +486,7 @@ XdmcpRegisterConnection (
            }
        }
 #endif
-       if (fromAddr && memcmp(regAddr, fromAddr, regAddrlen) != 0) {
+       if (!fromAddr || memcmp(regAddr, fromAddr, regAddrlen) != 0) {
            return;
        }
     }
-- 
1.7.4

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to