From a713832cbe494ff468a627e88b11164074bbd14e Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 13 Mar 2011 20:01:30 +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 Reviewed-by: Alan Coopersmith Signed-off-by: Keith Packard --- os/xdmcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/xdmcp.c b/os/xdmcp.c index 877b11c153..f5331e1b9f 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; } }