summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2011-03-13 20:01:30 +0000
committerKeith Packard <keithp@keithp.com>2011-03-14 13:11:38 -0700
commita713832cbe494ff468a627e88b11164074bbd14e (patch)
treed3a499cae0f7eb144f39545edb4f197fd01f9eb9
parent0ac4931753a5d5925fc844c8cbec08585aea57a7 (diff)
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@dronecode.org.uk> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--os/xdmcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 877b11c15..f5331e1b9 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;
}
}