diff options
Diffstat (limited to 'xc/lib/Xdmcp')
43 files changed, 107 insertions, 75 deletions
diff --git a/xc/lib/Xdmcp/A8Eq.c b/xc/lib/Xdmcp/A8Eq.c index cbe11421e..336cb54b2 100644 --- a/xc/lib/Xdmcp/A8Eq.c +++ b/xc/lib/Xdmcp/A8Eq.c @@ -1,5 +1,5 @@ /* - * $TOG: A8Eq.c /main/5 1998/02/06 14:38:24 kaleb $ + * $Xorg: A8Eq.c,v 1.3 2000/08/17 19:45:46 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/AA16.c b/xc/lib/Xdmcp/AA16.c index b8ebfb865..3f8b4f398 100644 --- a/xc/lib/Xdmcp/AA16.c +++ b/xc/lib/Xdmcp/AA16.c @@ -1,5 +1,5 @@ /* - * $TOG: AA16.c /main/4 1998/02/06 14:38:30 kaleb $ + * $Xorg: AA16.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:11 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/xc/lib/Xdmcp/AA32.c b/xc/lib/Xdmcp/AA32.c index ce7d29d4f..2d71f3d34 100644 --- a/xc/lib/Xdmcp/AA32.c +++ b/xc/lib/Xdmcp/AA32.c @@ -1,5 +1,5 @@ /* - * $TOG: AA32.c /main/4 1998/02/06 14:38:36 kaleb $ + * $Xorg: AA32.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:11 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/xc/lib/Xdmcp/AA8.c b/xc/lib/Xdmcp/AA8.c index 0437e6cc9..01597d345 100644 --- a/xc/lib/Xdmcp/AA8.c +++ b/xc/lib/Xdmcp/AA8.c @@ -1,5 +1,5 @@ /* - * $TOG: AA8.c /main/4 1998/02/06 14:38:42 kaleb $ + * $Xorg: AA8.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:12 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/xc/lib/Xdmcp/Alloc.c b/xc/lib/Xdmcp/Alloc.c index 9e5898402..1ebfb2274 100644 --- a/xc/lib/Xdmcp/Alloc.c +++ b/xc/lib/Xdmcp/Alloc.c @@ -1,5 +1,5 @@ /* - * $TOG: Alloc.c /main/3 1998/02/06 14:38:48 kaleb $ + * $Xorg: Alloc.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.3 2001/01/17 19:42:43 dawes Exp $ */ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */ diff --git a/xc/lib/Xdmcp/AofA8.c b/xc/lib/Xdmcp/AofA8.c index b0597b1e0..77a4be0d2 100644 --- a/xc/lib/Xdmcp/AofA8.c +++ b/xc/lib/Xdmcp/AofA8.c @@ -1,5 +1,5 @@ /* - * $TOG: AofA8.c /main/5 1998/02/06 14:38:53 kaleb $ + * $Xorg: AofA8.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:13 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/xc/lib/Xdmcp/CA8.c b/xc/lib/Xdmcp/CA8.c index 8f20956bd..fe6a115a0 100644 --- a/xc/lib/Xdmcp/CA8.c +++ b/xc/lib/Xdmcp/CA8.c @@ -1,5 +1,5 @@ /* - * $TOG: CA8.c /main/6 1998/02/06 14:38:59 kaleb $ + * $Xorg: CA8.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/CmpKey.c b/xc/lib/Xdmcp/CmpKey.c index dafe102de..1cb49e7a4 100644 --- a/xc/lib/Xdmcp/CmpKey.c +++ b/xc/lib/Xdmcp/CmpKey.c @@ -1,5 +1,5 @@ /* - * $TOG: CmpKey.c /main/4 1998/02/06 14:39:05 kaleb $ + * $Xorg: CmpKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:14 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/xc/lib/Xdmcp/DA16.c b/xc/lib/Xdmcp/DA16.c index 67333652a..0e1774053 100644 --- a/xc/lib/Xdmcp/DA16.c +++ b/xc/lib/Xdmcp/DA16.c @@ -1,5 +1,5 @@ /* - * $TOG: DA16.c /main/5 1998/02/06 14:39:10 kaleb $ + * $Xorg: DA16.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.4 1998/10/10 15:25:14 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/xc/lib/Xdmcp/DA32.c b/xc/lib/Xdmcp/DA32.c index e4fcae831..2758c40db 100644 --- a/xc/lib/Xdmcp/DA32.c +++ b/xc/lib/Xdmcp/DA32.c @@ -1,5 +1,5 @@ /* - * $TOG: DA32.c /main/5 1998/02/06 14:39:15 kaleb $ + * $Xorg: DA32.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/DA8.c b/xc/lib/Xdmcp/DA8.c index 2af63d334..be0bb5750 100644 --- a/xc/lib/Xdmcp/DA8.c +++ b/xc/lib/Xdmcp/DA8.c @@ -1,5 +1,5 @@ /* - * $TOG: DA8.c /main/5 1998/02/06 14:39:20 kaleb $ + * $Xorg: DA8.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/DAofA8.c b/xc/lib/Xdmcp/DAofA8.c index 69ac8a61c..b0e853d2d 100644 --- a/xc/lib/Xdmcp/DAofA8.c +++ b/xc/lib/Xdmcp/DAofA8.c @@ -1,5 +1,5 @@ /* - * $TOG: DAofA8.c /main/7 1998/06/25 16:26:01 kaleb $ + * $Xorg: DAofA8.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/DecKey.c b/xc/lib/Xdmcp/DecKey.c index 351bccaa8..f305ee28b 100644 --- a/xc/lib/Xdmcp/DecKey.c +++ b/xc/lib/Xdmcp/DecKey.c @@ -1,5 +1,5 @@ /* - * $TOG: DecKey.c /main/4 1998/02/06 14:39:30 kaleb $ + * $Xorg: DecKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:14 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/xc/lib/Xdmcp/Fill.c b/xc/lib/Xdmcp/Fill.c index 15470bd86..df48a6607 100644 --- a/xc/lib/Xdmcp/Fill.c +++ b/xc/lib/Xdmcp/Fill.c @@ -1,5 +1,5 @@ /* - * $TOG: Fill.c /main/12 1998/02/06 14:39:37 kaleb $ + * $Xorg: Fill.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.6 2000/05/11 18:14:10 tsi Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.7 2001/01/17 19:42:43 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/Xdmcp/Flush.c b/xc/lib/Xdmcp/Flush.c index 9de902aab..f02ac27ae 100644 --- a/xc/lib/Xdmcp/Flush.c +++ b/xc/lib/Xdmcp/Flush.c @@ -1,5 +1,5 @@ /* - * $TOG: Flush.c /main/12 1998/02/06 14:39:43 kaleb $ + * $Xorg: Flush.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.5 1998/10/03 08:42:51 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.6 2001/01/17 19:42:43 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/Xdmcp/GenKey.c b/xc/lib/Xdmcp/GenKey.c index 31a73bb72..592f99bf4 100644 --- a/xc/lib/Xdmcp/GenKey.c +++ b/xc/lib/Xdmcp/GenKey.c @@ -1,5 +1,5 @@ /* - * $TOG: GenKey.c /main/7 1998/02/06 14:39:49 kaleb $ + * $Xorg: GenKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.5 2000/11/14 18:20:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.6 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Imakefile b/xc/lib/Xdmcp/Imakefile index 62e042db0..8b05c40f1 100644 --- a/xc/lib/Xdmcp/Imakefile +++ b/xc/lib/Xdmcp/Imakefile @@ -1,5 +1,10 @@ -XCOMM $XConsortium: Imakefile /main/25 1996/09/28 16:43:40 rws $ -XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + + + + +XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.5 2001/01/17 19:42:43 dawes Exp $ + #define DoNormalLib NormalLibXdmcp #define DoSharedLib SharedLibXdmcp #define DoExtraLib SharedLibXdmcp diff --git a/xc/lib/Xdmcp/IncKey.c b/xc/lib/Xdmcp/IncKey.c index 688051951..86408a15e 100644 --- a/xc/lib/Xdmcp/IncKey.c +++ b/xc/lib/Xdmcp/IncKey.c @@ -1,5 +1,5 @@ /* - * $TOG: IncKey.c /main/4 1998/02/06 14:39:54 kaleb $ + * $Xorg: IncKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:15 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/xc/lib/Xdmcp/RA16.c b/xc/lib/Xdmcp/RA16.c index 642b70dec..76fafa6bb 100644 --- a/xc/lib/Xdmcp/RA16.c +++ b/xc/lib/Xdmcp/RA16.c @@ -1,5 +1,5 @@ /* - * $TOG: RA16.c /main/7 1998/06/25 16:26:16 kaleb $ + * $Xorg: RA16.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -35,8 +35,14 @@ XdmcpReadARRAY16 (buffer, array) { int i; - if (!XdmcpReadCARD8 (buffer, &array->length)) + if (!XdmcpReadCARD8 (buffer, &array->length)) { + + /* Must set array->data to NULL to guarantee safe call of + * XdmcpDisposeARRAY*(array) (which calls Xfree(array->data)); + * see defect 7329 */ + array->data = 0; return FALSE; + } if (!array->length) { array->data = NULL; diff --git a/xc/lib/Xdmcp/RA32.c b/xc/lib/Xdmcp/RA32.c index 5e4cd9cf5..e16d1d118 100644 --- a/xc/lib/Xdmcp/RA32.c +++ b/xc/lib/Xdmcp/RA32.c @@ -1,5 +1,5 @@ /* - * $TOG: RA32.c /main/7 1998/06/25 16:26:21 kaleb $ + * $Xorg: RA32.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -35,8 +35,14 @@ XdmcpReadARRAY32 (buffer, array) { int i; - if (!XdmcpReadCARD8 (buffer, &array->length)) + if (!XdmcpReadCARD8 (buffer, &array->length)) { + + /* Must set array->data to NULL to guarantee safe call of + * XdmcpDisposeARRAY*(array) (which calls Xfree(array->data)); + * see defect 7329 */ + array->data = 0; return FALSE; + } if (!array->length) { array->data = NULL; diff --git a/xc/lib/Xdmcp/RA8.c b/xc/lib/Xdmcp/RA8.c index cbba7f18e..a69f6212e 100644 --- a/xc/lib/Xdmcp/RA8.c +++ b/xc/lib/Xdmcp/RA8.c @@ -1,5 +1,5 @@ /* - * $TOG: RA8.c /main/7 1998/06/25 16:26:12 kaleb $ + * $Xorg: RA8.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -35,8 +35,14 @@ XdmcpReadARRAY8 (buffer, array) { int i; - if (!XdmcpReadCARD16 (buffer, &array->length)) + if (!XdmcpReadCARD16 (buffer, &array->length)) { + + /* Must set array->data to NULL to guarantee safe call of + * XdmcpDisposeARRAY*(array) (which calls Xfree(array->data)); + * see defect 7329 */ + array->data = 0; return FALSE; + } if (!array->length) { array->data = NULL; diff --git a/xc/lib/Xdmcp/RAofA8.c b/xc/lib/Xdmcp/RAofA8.c index e2e48c6d1..33280ec7f 100644 --- a/xc/lib/Xdmcp/RAofA8.c +++ b/xc/lib/Xdmcp/RAofA8.c @@ -1,5 +1,5 @@ /* - * $TOG: RAofA8.c /main/7 1998/06/25 16:26:07 kaleb $ + * $Xorg: RAofA8.c,v 1.5 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -35,8 +35,14 @@ XdmcpReadARRAYofARRAY8 (buffer, array) { int i; - if (!XdmcpReadCARD8 (buffer, &array->length)) + if (!XdmcpReadCARD8 (buffer, &array->length)) { + + /* Must set array->data to NULL to guarantee safe call of + * XdmcpDisposeARRAY*(array) (which calls Xfree(array->data)); + * see defect 7329 */ + array->data = 0; return FALSE; + } if (!array->length) { array->data = NULL; @@ -49,9 +55,12 @@ XdmcpReadARRAYofARRAY8 (buffer, array) { if (!XdmcpReadARRAY8 (buffer, &array->data[i])) { - Xfree (array->data); - array->data = NULL; - array->length = 0; + + /* All arrays allocated thus far in the loop must be freed + * if there is an error in the read. + * See Defect 7328 */ + array->length = i; + XdmcpDisposeARRAYofARRAY8(array); return FALSE; } } diff --git a/xc/lib/Xdmcp/RC16.c b/xc/lib/Xdmcp/RC16.c index 0e5ddd404..ad504e055 100644 --- a/xc/lib/Xdmcp/RC16.c +++ b/xc/lib/Xdmcp/RC16.c @@ -1,5 +1,5 @@ /* - * $TOG: RC16.c /main/4 1998/02/06 14:40:39 kaleb $ + * $Xorg: RC16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/RC32.c b/xc/lib/Xdmcp/RC32.c index 364a3b8a7..f4758df04 100644 --- a/xc/lib/Xdmcp/RC32.c +++ b/xc/lib/Xdmcp/RC32.c @@ -1,5 +1,5 @@ /* - * $TOG: RC32.c /main/4 1998/02/06 14:40:44 kaleb $ + * $Xorg: RC32.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/RC8.c b/xc/lib/Xdmcp/RC8.c index 47a263469..13e1d077a 100644 --- a/xc/lib/Xdmcp/RC8.c +++ b/xc/lib/Xdmcp/RC8.c @@ -1,5 +1,5 @@ /* - * $TOG: RC8.c /main/5 1998/02/06 14:40:49 kaleb $ + * $Xorg: RC8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/RHead.c b/xc/lib/Xdmcp/RHead.c index 688d0f84d..a8d065bbc 100644 --- a/xc/lib/Xdmcp/RHead.c +++ b/xc/lib/Xdmcp/RHead.c @@ -1,5 +1,5 @@ /* - * $TOG: RHead.c /main/4 1998/02/06 14:40:55 kaleb $ + * $Xorg: RHead.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/RR.c b/xc/lib/Xdmcp/RR.c index dc5e1b931..6656f1dc8 100644 --- a/xc/lib/Xdmcp/RR.c +++ b/xc/lib/Xdmcp/RR.c @@ -1,5 +1,5 @@ /* - * $TOG: RR.c /main/4 1998/02/06 14:41:00 kaleb $ + * $Xorg: RR.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/RaA16.c b/xc/lib/Xdmcp/RaA16.c index 7a3db5b61..ac66d48de 100644 --- a/xc/lib/Xdmcp/RaA16.c +++ b/xc/lib/Xdmcp/RaA16.c @@ -1,5 +1,5 @@ /* - * $TOG: RaA16.c /main/4 1998/02/06 14:40:14 kaleb $ + * $Xorg: RaA16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:15 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/xc/lib/Xdmcp/RaA32.c b/xc/lib/Xdmcp/RaA32.c index ad53585d1..18939110f 100644 --- a/xc/lib/Xdmcp/RaA32.c +++ b/xc/lib/Xdmcp/RaA32.c @@ -1,5 +1,5 @@ /* - * $TOG: RaA32.c /main/4 1998/02/06 14:40:18 kaleb $ + * $Xorg: RaA32.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:16 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/xc/lib/Xdmcp/RaA8.c b/xc/lib/Xdmcp/RaA8.c index eee2b37d9..b797e3ea7 100644 --- a/xc/lib/Xdmcp/RaA8.c +++ b/xc/lib/Xdmcp/RaA8.c @@ -1,5 +1,5 @@ /* - * $TOG: RaA8.c /main/4 1998/02/06 14:40:24 kaleb $ + * $Xorg: RaA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:16 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/xc/lib/Xdmcp/RaAoA8.c b/xc/lib/Xdmcp/RaAoA8.c index 21f6f96c3..a135b95c0 100644 --- a/xc/lib/Xdmcp/RaAoA8.c +++ b/xc/lib/Xdmcp/RaAoA8.c @@ -1,5 +1,5 @@ /* - * $TOG: RaAoA8.c /main/4 1998/02/06 14:40:30 kaleb $ + * $Xorg: RaAoA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:16 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/xc/lib/Xdmcp/Unwrap.c b/xc/lib/Xdmcp/Unwrap.c index 76049a049..613b9a771 100644 --- a/xc/lib/Xdmcp/Unwrap.c +++ b/xc/lib/Xdmcp/Unwrap.c @@ -1,5 +1,5 @@ /* - * $TOG: Unwrap.c /main/10 1998/02/06 14:41:06 kaleb $ + * $Xorg: Unwrap.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:16 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/xc/lib/Xdmcp/WA16.c b/xc/lib/Xdmcp/WA16.c index 07ad36faa..fb36d187b 100644 --- a/xc/lib/Xdmcp/WA16.c +++ b/xc/lib/Xdmcp/WA16.c @@ -1,5 +1,5 @@ /* - * $TOG: WA16.c /main/5 1998/02/06 14:41:12 kaleb $ + * $Xorg: WA16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/WA32.c b/xc/lib/Xdmcp/WA32.c index 12a57abd6..f964f2cf5 100644 --- a/xc/lib/Xdmcp/WA32.c +++ b/xc/lib/Xdmcp/WA32.c @@ -1,5 +1,5 @@ /* - * $TOG: WA32.c /main/5 1998/02/06 14:41:17 kaleb $ + * $Xorg: WA32.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/WA8.c b/xc/lib/Xdmcp/WA8.c index fe57f0b48..f89eaca74 100644 --- a/xc/lib/Xdmcp/WA8.c +++ b/xc/lib/Xdmcp/WA8.c @@ -1,5 +1,5 @@ /* - * $TOG: WA8.c /main/5 1998/02/06 14:41:21 kaleb $ + * $Xorg: WA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/WAofA8.c b/xc/lib/Xdmcp/WAofA8.c index 5f2b1d8a1..cdb18ca2c 100644 --- a/xc/lib/Xdmcp/WAofA8.c +++ b/xc/lib/Xdmcp/WAofA8.c @@ -1,5 +1,5 @@ /* - * $TOG: WAofA8.c /main/6 1998/02/06 14:41:27 kaleb $ + * $Xorg: WAofA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group diff --git a/xc/lib/Xdmcp/WC16.c b/xc/lib/Xdmcp/WC16.c index d89b813a8..990b2f661 100644 --- a/xc/lib/Xdmcp/WC16.c +++ b/xc/lib/Xdmcp/WC16.c @@ -1,5 +1,5 @@ /* - * $TOG: WC16.c /main/4 1998/02/06 14:41:31 kaleb $ + * $Xorg: WC16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.3 1998/10/25 07:11:19 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/xc/lib/Xdmcp/WC32.c b/xc/lib/Xdmcp/WC32.c index ba8f50fea..02562a19e 100644 --- a/xc/lib/Xdmcp/WC32.c +++ b/xc/lib/Xdmcp/WC32.c @@ -1,5 +1,5 @@ /* - * $TOG: WC32.c /main/4 1998/02/06 14:41:37 kaleb $ + * $Xorg: WC32.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -22,7 +22,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.3 1998/10/25 12:47:52 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/xc/lib/Xdmcp/WC8.c b/xc/lib/Xdmcp/WC8.c index b1a5a9b3a..907b3fa34 100644 --- a/xc/lib/Xdmcp/WC8.c +++ b/xc/lib/Xdmcp/WC8.c @@ -1,5 +1,5 @@ /* - * $TOG: WC8.c /main/4 1998/02/06 14:41:43 kaleb $ + * $Xorg: WC8.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.3 1998/10/25 07:11:20 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/xc/lib/Xdmcp/Whead.c b/xc/lib/Xdmcp/Whead.c index 980d92c12..3905aa077 100644 --- a/xc/lib/Xdmcp/Whead.c +++ b/xc/lib/Xdmcp/Whead.c @@ -1,5 +1,5 @@ /* - * $TOG: Whead.c /main/5 1998/02/06 14:41:48 kaleb $ + * $Xorg: Whead.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:17 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/xc/lib/Xdmcp/Wrap.c b/xc/lib/Xdmcp/Wrap.c index a9ba4e3f6..cb996a989 100644 --- a/xc/lib/Xdmcp/Wrap.c +++ b/xc/lib/Xdmcp/Wrap.c @@ -1,5 +1,5 @@ /* - * $TOG: Wrap.c /main/10 1998/02/06 14:41:53 kaleb $ + * $Xorg: Wrap.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ * * Copyright 1989, 1998 The Open Group @@ -23,7 +23,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.2 1998/10/10 15:25:18 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/xc/lib/Xdmcp/Wrap.h b/xc/lib/Xdmcp/Wrap.h index 3e3d0552d..b9ec1cfb2 100644 --- a/xc/lib/Xdmcp/Wrap.h +++ b/xc/lib/Xdmcp/Wrap.h @@ -1,9 +1,9 @@ -/* $XConsortium: Wrap.h,v 1.3 94/02/06 20:09:49 rws 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.2 1998/10/10 15:25:18 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/xc/lib/Xdmcp/Xdmcp.h b/xc/lib/Xdmcp/Xdmcp.h index a84874536..02e4c61ac 100644 --- a/xc/lib/Xdmcp/Xdmcp.h +++ b/xc/lib/Xdmcp/Xdmcp.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xdmcp.h,v 1.9 95/06/07 18:30:59 gildea Exp $ */ +/* $Xorg: Xdmcp.h,v 1.6 2000/08/17 19:45:50 cpqbld Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. * @@ -13,7 +13,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.3 1998/10/25 07:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.4 2001/01/17 19:42:44 dawes Exp $ */ #ifndef _XDMCP_H_ #define _XDMCP_H_ |