xserver: Branch 'master'

[Keith Packard]

 os/xdmcp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a713832cbe494ff468a627e88b11164074bbd14e
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun Mar 13 20:01:30 2011 +0000

    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 <jon.turney at dronecode.org.uk>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

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;
 	}
     }