Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

24 files changed, 26 insertions, 24 deletions

diff --git a/AA16.c b/AA16.c
index d1318e6..95978ab 100644
--- a/AA16.c
+++ b/AA16.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/AA32.c b/AA32.c
index 82f9fb1..21e69a6 100644
--- a/AA32.c
+++ b/AA32.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/AA8.c b/AA8.c
index aace23b..bdd61e4 100644
--- a/AA8.c
+++ b/AA8.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Alloc.c b/Alloc.c
index f69a1f3..9db8fc5 100644
--- a/Alloc.c
+++ b/Alloc.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.5 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */
 
 /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
 
diff --git a/AofA8.c b/AofA8.c
index 4338854..5419934 100644
--- a/AofA8.c
+++ b/AofA8.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/CmpKey.c b/CmpKey.c
index fedb422..bfffd82 100644
--- a/CmpKey.c
+++ b/CmpKey.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/DA16.c b/DA16.c
index 32e951f..692d1f3 100644
--- a/DA16.c
+++ b/DA16.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.6 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.5 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/DecKey.c b/DecKey.c
index 14b3637..e2893f3 100644
--- a/DecKey.c
+++ b/DecKey.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Fill.c b/Fill.c
index a5845de..111c386 100644
--- a/Fill.c
+++ b/Fill.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.9 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.8 2001/07/23 13:15:42 dawes Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
diff --git a/Flush.c b/Flush.c
index a83e27d..8be9790 100644
--- a/Flush.c
+++ b/Flush.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.7 2001/07/23 13:15:42 dawes Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
diff --git a/GenKey.c b/GenKey.c
index 4769baa..d372424 100644
--- a/GenKey.c
+++ b/GenKey.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/IncKey.c b/IncKey.c
index 1b2a7fd..cdd08dc 100644
--- a/IncKey.c
+++ b/IncKey.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/RaA16.c b/RaA16.c
index fd1dbd8..525a2a1 100644
--- a/RaA16.c
+++ b/RaA16.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/RaA32.c b/RaA32.c
index dd6e72e..ef1ab6e 100644
--- a/RaA32.c
+++ b/RaA32.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/RaA8.c b/RaA8.c
index f64ef64..7d671d8 100644
--- a/RaA8.c
+++ b/RaA8.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/RaAoA8.c b/RaAoA8.c
index d6eeb7d..0dd5243 100644
--- a/RaAoA8.c
+++ b/RaAoA8.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Unwrap.c b/Unwrap.c
index 56da322..8a5c9eb 100644
--- a/Unwrap.c
+++ b/Unwrap.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/WC16.c b/WC16.c
index 738d658..1c86c90 100644
--- a/WC16.c
+++ b/WC16.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/WC32.c b/WC32.c
index 51ae48d..9634567 100644
--- a/WC32.c
+++ b/WC32.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/WC8.c b/WC8.c
index 625e860..c7f7012 100644
--- a/WC8.c
+++ b/WC8.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Whead.c b/Whead.c
index ae1d691..4b991d8 100644
--- a/Whead.c
+++ b/Whead.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Wrap.c b/Wrap.c
index 5f4870b..2811cbd 100644
--- a/Wrap.c
+++ b/Wrap.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.4 2001/12/14 19:54:56 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Wrap.h b/Wrap.h
index a5e7553..3a81b65 100644
--- a/Wrap.h
+++ b/Wrap.h
@@ -1,9 +1,10 @@
+/* $XdotOrg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */
 /* $Xorg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */
 /*
  * header file for compatibility with something useful
  */
 
-/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.4 2003/12/19 02:05:38 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
 typedef unsigned char auth_cblock[8];	/* block size */
 
diff --git a/include/X11/Xdmcp.h b/include/X11/Xdmcp.h
index 64039b5..9c40619 100644
--- a/include/X11/Xdmcp.h
+++ b/include/X11/Xdmcp.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
 /* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -13,7 +14,7 @@
  * without express or implied warranty.
  *
  */
-/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.8 2003/11/22 04:50:59 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.7 2003/07/09 15:27:29 tsi Exp $ */
 
 #ifndef _XDMCP_H_
 #define _XDMCP_H_