Revert "XDMCP: For IPv6 add link local addresses to the end of the list"
This reverts commit fdd448cd39
.
This commit is contained in:
parent
fdd448cd39
commit
111a045dcf
12
os/access.c
12
os/access.c
|
@ -827,9 +827,7 @@ DefineSelf(int fd)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ignore 'localhost' entries as they're not useful
|
* ignore 'localhost' entries as they're not useful
|
||||||
* on the other end of the wire and because on hosts
|
* on the other end of the wire
|
||||||
* with shared home dirs they'll result in conflicting
|
|
||||||
* entries in ~/.Xauthority
|
|
||||||
*/
|
*/
|
||||||
if (ifr->ifa_flags & IFF_LOOPBACK)
|
if (ifr->ifa_flags & IFF_LOOPBACK)
|
||||||
continue;
|
continue;
|
||||||
|
@ -850,14 +848,6 @@ DefineSelf(int fd)
|
||||||
else if (family == FamilyInternet6 &&
|
else if (family == FamilyInternet6 &&
|
||||||
IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
|
IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Ignore IPv6 link local addresses (fe80::/10), because
|
|
||||||
* they need a scope identifier, which we have no way
|
|
||||||
* of telling to the other end.
|
|
||||||
*/
|
|
||||||
if (family == FamilyInternet6 &&
|
|
||||||
IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr))
|
|
||||||
continue;
|
|
||||||
#endif
|
#endif
|
||||||
XdmcpRegisterConnection(family, (char *) addr, len);
|
XdmcpRegisterConnection(family, (char *) addr, len);
|
||||||
#if defined(IPv6) && defined(AF_INET6)
|
#if defined(IPv6) && defined(AF_INET6)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user