xserver: Branch 'master'

[Adam Jackson]

 os/access.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 111a045dcf0912dc5b178c18acda479b3972876b
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 21 11:45:17 2016 -0400

    Revert "XDMCP: For IPv6 add link local addresses to the end of the list"
    
    This reverts commit fdd448cd39b4ca84a28d73fc628911070437b703.

diff --git a/os/access.c b/os/access.c
index e7d9d29..8828e08 100644
--- a/os/access.c
+++ b/os/access.c
@@ -827,9 +827,7 @@ DefineSelf(int fd)
 
             /*
              * ignore 'localhost' entries as they're not useful
-             * on the other end of the wire and because on hosts
-             * with shared home dirs they'll result in conflicting
-             * entries in ~/.Xauthority
+             * on the other end of the wire
              */
             if (ifr->ifa_flags & IFF_LOOPBACK)
                 continue;
@@ -850,14 +848,6 @@ DefineSelf(int fd)
             else if (family == FamilyInternet6 &&
                      IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
                 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
             XdmcpRegisterConnection(family, (char *) addr, len);
 #if defined(IPv6) && defined(AF_INET6)