Merge the new release from HEAD

13 files changed, 14 insertions, 13 deletions

diff --git a/access.c b/access.c
index 0e612a1..8a667bc 100644
--- a/access.c
+++ b/access.c
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg$
+ * $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 22a7ba1..5f9df4c 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/auth.c,v 1.1.4.4 2003/12/06 13:24:29 kaleb 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 7d30e10..55f2eb4 100644
--- a/chooser.c
+++ b/chooser.c
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg$
+ * $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 580409c..eca6952 100644
--- a/config/Xaccess
+++ b/config/Xaccess
@@ -1,4 +1,4 @@
-# $XdotOrg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld 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 96d35f3..0bcad1f 100644
--- a/dm.h
+++ b/dm.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs 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 0b54b8d..14dc1b4 100644
--- a/genauth.c
+++ b/genauth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/genauth.c,v 1.1.4.5 2003/12/20 00:28:31 kaleb 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 1137c00..883f963 100644
--- a/resource.c
+++ b/resource.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: resource.c,v 1.4 2001/02/09 02:05:40 xorgcvs 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 66d7696..86bb601 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/session.c,v 1.1.4.4 2003/12/06 13:24:29 kaleb 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 a5a4dc7..cf5edf9 100644
--- a/socket.c
+++ b/socket.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/xdm/socket.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
diff --git a/util.c b/util.c
index cea100c..b60ddff 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: util.c,v 1.4 2001/02/09 02:05:41 xorgcvs 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 f37da82..f6d4f4e 100644
--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -1,4 +1,4 @@
-.\" $XdotOrg: xc/programs/xdm/xdm.man,v 1.1.4.3 2003/12/06 13:24:29 kaleb Exp $
+.\" $XdotOrg: xc/programs/xdm/xdm.man,v 1.2 2004/04/23 19:54:42 eich Exp $
 .\" $Xorg: xdm.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
 .\" Copyright 1988, 1994, 1998  The Open Group
 .\"
diff --git a/xdmcp.c b/xdmcp.c
index ea273e4..f8c5bfc 100644
--- a/xdmcp.c
+++ b/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.1.4.4 2003/12/06 13:24:29 kaleb Exp $ */
+/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
 /*