merge XFree86 4.3.99.901 (RC1) from vendor branch

1 files changed, 36 insertions, 4 deletions

diff --git a/access.c b/access.c
index 567129e..77b80f6 100644
--- a/access.c
+++ b/access.c
@@ -1,4 +1,5 @@
 /*
+ * $XdotOrg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $
  * $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $
  *
 Copyright 1990, 1998  The Open Group
@@ -27,7 +28,7 @@ in this Software without prior written authorization from the copyright holder.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdm/access.c,v 3.12 2003/07/18 15:53:28 tsi Exp $ */
+/* $XFree86: xc/programs/xdm/access.c,v 3.14 2003/11/23 22:02:07 herrb Exp $ */
 
 /*
  * Access control for XDMCP - keep a database of allowable display addresses
@@ -49,6 +50,10 @@ in this Software without prior written authorization from the copyright holder.
 
 # include   <netdb.h>
 
+# if defined(IPv6) && defined(AF_INET6)
+#  include        <arpa/inet.h>
+# endif
+
 #define ALIAS_CHARACTER	    '%'
 #define NEGATE_CHARACTER    '!'
 #define CHOOSER_STRING	    "CHOOSER"
@@ -330,7 +335,7 @@ tryagain:
 	}
 #else
 	if (hostent) {
-	    addr = &(hostent->h_addr);
+	    addr = hostent->h_addr;
 	    addr_length = hostent->h_length;
 	}
 #endif
@@ -440,9 +445,10 @@ ReadDisplayEntry (FILE *file)
 #else
 	    struct hostent  *hostent;
 
-	    if ((hostent = gethostbyname (displayOrAlias)) == NULL)
+	    if ((hostent = gethostbyname (displayOrAlias)) != NULL)
 	    {
-		addr = &(hostent->h_addr);
+		Debug("ReadDisplayEntry: %s\n", displayOrAlias);
+		addr = hostent->h_addr;
 		addrtype = hostent->h_addrtype;
 		addr_length = hostent->h_length;
 	    }
@@ -906,6 +912,32 @@ void ForEachListenAddr (
     }
     if (!listenFound) {
 	(*listenfunction) (NULL, closure);
+#if defined(IPv6) && defined(AF_INET6) && defined(XDM_DEFAULT_MCAST_ADDR6)
+	{   /* Join default IPv6 Multicast Group */
+
+	    static ARRAY8	defaultMcastAddress;
+
+	    if (defaultMcastAddress.length == 0) {
+		struct in6_addr addr6;
+	    
+		if (inet_pton(AF_INET6,XDM_DEFAULT_MCAST_ADDR6,&addr6) == 1) {
+		    if (!XdmcpAllocARRAY8 (&defaultMcastAddress, 
+		      sizeof(struct in6_addr))) {
+			LogOutOfMem ("ReadHostEntry\n");
+			defaultMcastAddress.length = -1;
+		    } else {
+			memcpy(defaultMcastAddress.data, &addr6, 
+			  sizeof(struct in6_addr));
+		    }
+		} else {
+		    defaultMcastAddress.length = -1;
+		}
+	    }
+	    if ( defaultMcastAddress.length == sizeof(struct in6_addr) ) {
+		(*mcastfunction) (&defaultMcastAddress, closure);
+	    }
+	}
+#endif
     }
 }