Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE

13 files changed, 28 insertions, 16 deletions

diff --git a/access.c b/access.c
index a705323..8a667bc 100644
--- a/access.c
+++ b/access.c
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/programs/xdm/access.c,v 1.1.4.3.4.1 2004/03/04 17:48:55 eich Exp $
+ * $XdotOrg: xc/programs/xdm/access.c,v 1.2 2004/04/23 19:54:42 eich Exp $
  * $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $
  *
 Copyright 1990, 1998  The Open Group
diff --git a/auth.c b/auth.c
index b867293..5f9df4c 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/auth.c,v 1.1.4.5.2.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/auth.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: auth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/chooser.c b/chooser.c
index 772b947..55f2eb4 100644
--- a/chooser.c
+++ b/chooser.c
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/programs/xdm/chooser.c,v 1.1.4.6.2.2 2004/03/12 11:18:23 eich Exp $
+ * $XdotOrg: xc/programs/xdm/chooser.c,v 1.2 2004/04/23 19:54:42 eich Exp $
  * $Xorg: chooser.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $
  *
 Copyright 1990, 1998  The Open Group
diff --git a/config/Xaccess b/config/Xaccess
index 8a3ea0e..eca6952 100644
--- a/config/Xaccess
+++ b/config/Xaccess
@@ -1,4 +1,4 @@
-# $XdotOrg: xc/programs/xdm/config/Xaccess,v 1.1.4.3.4.1 2004/03/04 17:48:56 eich Exp $
+# $XdotOrg: xc/programs/xdm/config/Xaccess,v 1.2 2004/04/23 19:54:43 eich Exp $
 # $Xorg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
 # $XFree86: xc/programs/xdm/config/Xaccess,v 1.4 2003/07/09 15:27:40 tsi Exp $
 #
diff --git a/dm.h b/dm.h
index 09b4c00..0bcad1f 100644
--- a/dm.h
+++ b/dm.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/dm.h,v 1.1.4.3.4.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/dm.h,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/genauth.c b/genauth.c
index 39e5542..14dc1b4 100644
--- a/genauth.c
+++ b/genauth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/genauth.c,v 1.1.4.6.2.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/genauth.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/greeter/verify.c b/greeter/verify.c
index d68b2ba..f3ff9a9 100644
--- a/greeter/verify.c
+++ b/greeter/verify.c
@@ -1,4 +1,5 @@
 /* $Xorg: verify.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/xdm/greeter/verify.c,v 1.3 2004/04/24 23:28:17 alanc Exp $ */
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -343,7 +344,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
              		XFree(console); 
 	                return 0;
                 }
-		Xfree(console);	
+		XFree(console);	
 	    }
 	    else
 	    {
diff --git a/resource.c b/resource.c
index dae7e4a..883f963 100644
--- a/resource.c
+++ b/resource.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/resource.c,v 1.1.4.3.4.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/resource.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: resource.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/session.c b/session.c
index 0754d51..86bb601 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/session.c,v 1.1.4.5.2.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/session.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/socket.c b/socket.c
index 12be9f7..fcc7583 100644
--- a/socket.c
+++ b/socket.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/socket.c,v 1.1.4.3.4.2 2004/03/12 11:18:23 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/socket.c,v 1.3 2004/07/06 00:44:39 anholt Exp $ */
 /* $Xorg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
@@ -67,6 +67,9 @@ CreateWellKnownSockets (void)
     char *name = localHostname ();
     registerHostname (name, strlen (name));
 
+    if (request_port == 0)
+	return;
+
 #if defined(IPv6) && defined(AF_INET6)
     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
     if (chooserFd == -1)
diff --git a/util.c b/util.c
index 41e5c34..b60ddff 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/util.c,v 1.1.4.2.4.1 2004/03/04 17:48:55 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/util.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: util.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
 /*
 
diff --git a/xdm.man.cpp b/xdm.man.cpp
index 24cdaf8..23d16c0 100644
--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -1,4 +1,4 @@
-.\" $XdotOrg: xc/programs/xdm/xdm.man,v 1.1.4.4.2.1 2004/03/04 17:48:55 eich Exp $
+.\" $XdotOrg: xc/programs/xdm/xdm.man,v 1.3 2004/07/26 22:56:33 herrb Exp $
 .\" $Xorg: xdm.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
 .\" Copyright 1988, 1994, 1998  The Open Group
 .\"
@@ -145,7 +145,7 @@ When the \fIXsession\fP script exits, the session is over.
 At the end of the session, the \fIXreset\fP script is run to clean up,
 the X server is reset, and the cycle starts over.
 .PP
-The file \fI __projectroot__/lib/X11/xdm/xdm-errors\fP will contain error
+The file \fI XDMLOGDIR/xdm.log\fP will contain error
 messages from
 .I xdm
 and anything output to stderr by \fIXsetup, Xstartup, Xsession\fP
@@ -609,7 +609,7 @@ named \fIxdm-config\fP:
 .ta .5i 4i
 
 	DisplayManager.servers:	__projectroot__/lib/X11/xdm/Xservers
-	DisplayManager.errorLogFile:	__projectroot__/lib/X11/xdm/xdm-errors
+	DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
 	DisplayManager*resources:	__projectroot__/lib/X11/xdm/Xresources
 	DisplayManager*startup:	__projectroot__/lib/X11/xdm/Xstartup
 	DisplayManager*session:	__projectroot__/lib/X11/xdm/Xsession
diff --git a/xdmcp.c b/xdmcp.c
index a5c54d1..ac5c3d4 100644
--- a/xdmcp.c
+++ b/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.1.4.5.2.1 2004/03/04 17:48:56 eich Exp $ */
+/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.4 2004/08/07 19:22:01 alanc Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
 /*
 
@@ -943,13 +943,20 @@ request_respond (
     ARRAY8Ptr	    connectionAddress;
 
     Debug ("Request respond %d\n", length);
+    connectionTypes.length = 0;
     connectionTypes.data = 0;
+    connectionAddresses.length = 0;
     connectionAddresses.data = 0;
+    authenticationName.length = 0;
     authenticationName.data = 0;
+    authenticationData.length = 0;
     authenticationData.data = 0;
+    authorizationNames.length = 0;
     authorizationNames.data = 0;
     authorizationName.length = 0;
+    authorizationName.data = 0;
     authorizationData.length = 0;
+    authorizationData.data = 0;
     manufacturerDisplayID.data = 0;
     if (XdmcpReadCARD16 (&buffer, &displayNumber) &&
 	XdmcpReadARRAY16 (&buffer, &connectionTypes) &&
@@ -1190,7 +1197,8 @@ manage (
 					 &pdpy->connectionAddress,
 					 from,
 					 pdpy->displayNumber);
-	    Debug ("Computed display name: %s\n", name);
+	    Debug ("Computed display name: %s for: %s\n",
+		   name, (char *)pdpy->connectionAddress.data);
 	    if (!name)
 	    {
 		send_failed (from, fromlen, "(no name)", sessionID,