diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:41:18 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:41:18 +0000 |
| commit | cbd4eef70eee22ec05436100046c695f3d68443a (patch) | |
| tree | 6e24296dce6465c114e3910cc5351fa79e0eb8a3 | |
| parent | 08f8e56701977d8d3c5a67b22047019633ba6375 (diff) | |
Merge the new release from HEADXACE-SELINUX
60 files changed, 79 insertions, 74 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index f03c65c3..80289128 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.9 2004-04-15 10:14:54 eich Exp $ */ +/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.8.4.1 2004-05-04 19:42:43 ewalsh Exp $ */ /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* diff --git a/man/IsCursorKey.man b/man/IsCursorKey.man index b5566527..c15dd4f9 100644 --- a/man/IsCursorKey.man +++ b/man/IsCursorKey.man @@ -1,4 +1,4 @@ -.\" $XdotOrg: lib/X11/man/IsCursorKey.man,v 1.1.4.4 2004-04-15 10:13:24 eich Exp $ +.\" $XdotOrg: lib/X11/man/IsCursorKey.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining diff --git a/man/XAddHost.man b/man/XAddHost.man index 84361031..c9db6847 100644 --- a/man/XAddHost.man +++ b/man/XAddHost.man @@ -47,7 +47,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.3 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.1.4.5 2004-04-15 10:13:24 eich Exp $ +.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man index cd648c88..fae03fc0 100644 --- a/man/XAllocSizeHints.man +++ b/man/XAllocSizeHints.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocSizeHints.man,v 1.1.4.4 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XAllocSizeHints.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man index 4ab9be3a..7c8a91da 100644 --- a/man/XAllocStandardColormap.man +++ b/man/XAllocStandardColormap.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocStandardColormap.man,v 1.1.4.4 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XAllocStandardColormap.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man index fce0d21d..9589cee0 100644 --- a/man/XAllocWMHints.man +++ b/man/XAllocWMHints.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocWMHints.man,v 1.1.4.4 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XAllocWMHints.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAnyEvent.man b/man/XAnyEvent.man index 8f949025..0d1d1e71 100644 --- a/man/XAnyEvent.man +++ b/man/XAnyEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAnyEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XAnyEvent.man,v 1.1.4.3 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XAnyEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XButtonEvent.man b/man/XButtonEvent.man index 272f8c75..534da65d 100644 --- a/man/XButtonEvent.man +++ b/man/XButtonEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XButEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XButtonEvent.man,v 1.1.4.3 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XButtonEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man index 91e71612..9bbb66ad 100644 --- a/man/XChangeKeyboardControl.man +++ b/man/XChangeKeyboardControl.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XChangeKeyboardControl.man,v 1.1.4.4 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XChangeKeyboardControl.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man index ea9b7af0..35f0e05e 100644 --- a/man/XChangeKeyboardMapping.man +++ b/man/XChangeKeyboardMapping.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XChangeKeyboardMapping.man,v 1.1.4.4 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XChangeKeyboardMapping.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCirculateEvent.man b/man/XCirculateEvent.man index 5e16ba3e..7aa0c4a6 100644 --- a/man/XCirculateEvent.man +++ b/man/XCirculateEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCirEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCirculateEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCirculateEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCirculateRequestEvent.man b/man/XCirculateRequestEvent.man index 3cb24289..2c8d5ee1 100644 --- a/man/XCirculateRequestEvent.man +++ b/man/XCirculateRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCirREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCirculateRequestEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCirculateRequestEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XClientMessageEvent.man b/man/XClientMessageEvent.man index 805d0d48..e1c1af4c 100644 --- a/man/XClientMessageEvent.man +++ b/man/XClientMessageEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCMEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XClientMessageEvent.man,v 1.1.4.3 2004-03-05 13:38:15 eich Exp $ +.\" $XdotOrg: lib/X11/man/XClientMessageEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XColormapEvent.man b/man/XColormapEvent.man index 40ce86ee..f02ff16b 100644 --- a/man/XColormapEvent.man +++ b/man/XColormapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCmpEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XColormapEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XColormapEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureEvent.man b/man/XConfigureEvent.man index 5815d18c..2f3cddfe 100644 --- a/man/XConfigureEvent.man +++ b/man/XConfigureEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureRequestEvent.man b/man/XConfigureRequestEvent.man index df222c65..1626360a 100644 --- a/man/XConfigureRequestEvent.man +++ b/man/XConfigureRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureRequestEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureRequestEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man index c1a129bc..01697101 100644 --- a/man/XConfigureWindow.man +++ b/man/XConfigureWindow.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureWindow.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureWindow.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man index f5adcd27..fd851aab 100644 --- a/man/XCreateColormap.man +++ b/man/XCreateColormap.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateColormap.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCreateColormap.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateGC.man b/man/XCreateGC.man index d3bd94e2..e7385f55 100644 --- a/man/XCreateGC.man +++ b/man/XCreateGC.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.6 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateGC.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCreateGC.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man index 2f5d70ec..fde6260f 100644 --- a/man/XCreateWindow.man +++ b/man/XCreateWindow.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateWindowEvent.man b/man/XCreateWindowEvent.man index f7cee795..fbb00ef5 100644 --- a/man/XCreateWindowEvent.man +++ b/man/XCreateWindowEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCWEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCreateWindowEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCreateWindowEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCrossingEvent.man b/man/XCrossingEvent.man index 5cb56139..31e6420b 100644 --- a/man/XCrossingEvent.man +++ b/man/XCrossingEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCroEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCrossingEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XCrossingEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDestroyWindowEvent.man b/man/XDestroyWindowEvent.man index 71a7e261..863b151f 100644 --- a/man/XDestroyWindowEvent.man +++ b/man/XDestroyWindowEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDWEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XDestroyWindowEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XDestroyWindowEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDrawArc.man b/man/XDrawArc.man index 1364e029..427e00c4 100644 --- a/man/XDrawArc.man +++ b/man/XDrawArc.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XDrawArc.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XDrawArc.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDrawText.man b/man/XDrawText.man index 5de78d4d..c18fed54 100644 --- a/man/XDrawText.man +++ b/man/XDrawText.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XDrawText.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XDrawText.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man index f629cce5..c6747052 100644 --- a/man/XErrorEvent.man +++ b/man/XErrorEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XErrEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XErrorEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XErrorEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XExposeEvent.man b/man/XExposeEvent.man index 39d46d43..bd8c43e1 100644 --- a/man/XExposeEvent.man +++ b/man/XExposeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XExpEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XExposeEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XExposeEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XFocusChangeEvent.man b/man/XFocusChangeEvent.man index d157ae79..509f8b63 100644 --- a/man/XFocusChangeEvent.man +++ b/man/XFocusChangeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XFCEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XFocusChangeEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XFocusChangeEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XFontSetExtents.man b/man/XFontSetExtents.man index 85d10f9c..dd69e5d3 100644 --- a/man/XFontSetExtents.man +++ b/man/XFontSetExtents.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XFSExt.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XFontSetExtents.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XFontSetExtents.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man index dc376f07..43af29ad 100644 --- a/man/XGetVisualInfo.man +++ b/man/XGetVisualInfo.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.4 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XGetVisualInfo.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XGetVisualInfo.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man index 675680e1..06fcd919 100644 --- a/man/XGetWindowAttributes.man +++ b/man/XGetWindowAttributes.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XGetWindowAttributes.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XGetWindowAttributes.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGraphicsExposeEvent.man b/man/XGraphicsExposeEvent.man index c063c48c..e7e46b13 100644 --- a/man/XGraphicsExposeEvent.man +++ b/man/XGraphicsExposeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGEEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XGraphicsExposeEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XGraphicsExposeEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGravityEvent.man b/man/XGravityEvent.man index ef0f2ee6..1f4b6085 100644 --- a/man/XGravityEvent.man +++ b/man/XGravityEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XGravityEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XGravityEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XKeymapEvent.man b/man/XKeymapEvent.man index 6f80d82c..038f9575 100644 --- a/man/XKeymapEvent.man +++ b/man/XKeymapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XKMapEven.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XKeymapEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XKeymapEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XLoadFont.man b/man/XLoadFont.man index 79aa8238..4d76eeb5 100644 --- a/man/XLoadFont.man +++ b/man/XLoadFont.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XMapEvent.man b/man/XMapEvent.man index 4f58d955..9a2d7892 100644 --- a/man/XMapEvent.man +++ b/man/XMapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XMEvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XMapEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XMapEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XMapRequestEvent.man b/man/XMapRequestEvent.man index c50e57f3..908c48dd 100644 --- a/man/XMapRequestEvent.man +++ b/man/XMapRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XMREvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XMapRequestEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XMapRequestEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XPropertyEvent.man b/man/XPropertyEvent.man index a41291f3..0c288cfe 100644 --- a/man/XPropertyEvent.man +++ b/man/XPropertyEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XPEvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XPropertyEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XPropertyEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XReparentEvent.man b/man/XReparentEvent.man index 10ff6757..e951494e 100644 --- a/man/XReparentEvent.man +++ b/man/XReparentEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XREvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XReparentEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XReparentEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XResizeRequestEvent.man b/man/XResizeRequestEvent.man index b684b665..5369d2e8 100644 --- a/man/XResizeRequestEvent.man +++ b/man/XResizeRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XRREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XResizeRequestEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XResizeRequestEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionClearEvent.man b/man/XSelectionClearEvent.man index d003a37b..4fcd2dfe 100644 --- a/man/XSelectionClearEvent.man +++ b/man/XSelectionClearEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSCEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionClearEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionClearEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionEvent.man b/man/XSelectionEvent.man index ef96895b..845843ce 100644 --- a/man/XSelectionEvent.man +++ b/man/XSelectionEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionRequestEvent.man b/man/XSelectionRequestEvent.man index 1c23cf53..70918c6d 100644 --- a/man/XSelectionRequestEvent.man +++ b/man/XSelectionRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionRequestEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionRequestEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man index e835b38f..208ea94e 100644 --- a/man/XStringListToTextProperty.man +++ b/man/XStringListToTextProperty.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.5 2003/04/28 22:17:56 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.6 2004-04-15 10:13:25 eich Exp $ +.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.5.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XUnmapEvent.man b/man/XUnmapEvent.man index fe3dbd20..3b29bd1a 100644 --- a/man/XUnmapEvent.man +++ b/man/XUnmapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XUmapEven.man,v 1.2 2001/01/27 18:20:06 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XUnmapEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XUnmapEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XVisibilityEvent.man b/man/XVisibilityEvent.man index 08824692..31d01ff3 100644 --- a/man/XVisibilityEvent.man +++ b/man/XVisibilityEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XVEvent.man,v 1.3 2001/08/13 19:34:52 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XVisibilityEvent.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XVisibilityEvent.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XcmsColor.man b/man/XcmsColor.man index 33ca0527..c77324d0 100644 --- a/man/XcmsColor.man +++ b/man/XcmsColor.man @@ -40,7 +40,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XcmsClr.man,v 3.4 2001/01/27 18:20:06 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XcmsColor.man,v 1.1.4.3 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XcmsColor.man,v 1.1.4.3.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man index 6682d5aa..8db90662 100644 --- a/man/XmbDrawText.man +++ b/man/XmbDrawText.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.4 2003/04/28 22:17:58 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.6 2004-04-15 10:13:25 eich Exp $ +.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.5.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man index e6ef1a93..ea9a44ec 100644 --- a/man/XmbTextListToTextProperty.man +++ b/man/XmbTextListToTextProperty.man @@ -43,7 +43,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XTLTTProp.man,v 1.6 2003/04/28 22:17:57 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.6 2004-04-15 10:13:25 eich Exp $ +.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.5.4.1 2004-05-04 19:41:21 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man index 7f2b4789..ee1c0eee 100644 --- a/man/XrmInitialize.man +++ b/man/XrmInitialize.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.4 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XrmInitialize.man,v 1.1.4.4 2004-03-05 13:38:16 eich Exp $ +.\" $XdotOrg: lib/X11/man/XrmInitialize.man,v 1.1.4.4.4.1 2004-05-04 19:41:18 ewalsh Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre index 10440310..9722ff65 100644 --- a/nls/locale.alias.pre +++ b/nls/locale.alias.pre @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.7 2004-03-05 13:39:45 eich Exp $ +XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.7.4.1 2004-05-04 19:42:58 ewalsh Exp $ XCOMM $Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ XCOMM XCOMM This file contains alias name of locale. diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index 36767bad..7f608833 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.6 2004-03-05 13:39:45 eich Exp $ +XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.6.4.1 2004-05-04 19:42:58 ewalsh Exp $ XCOMM $Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ XCOMM XCOMM This file contains locale database file names diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre index f9670d64..0eccf166 100644 --- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre +++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre @@ -2,7 +2,7 @@ XCOMM XFree86 NLS for Chinese locale zh_CN.UTF-8 XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8 XCOMM by James Su <suzhe@turbolinux.com.cn> XCOMM -XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.4.2 2004-03-05 13:39:47 eich Exp $ +XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.4.2.4.1 2004-05-04 19:42:58 ewalsh Exp $ XCOMM $XFree86$ XCOMM diff --git a/src/ConnDis.c b/src/ConnDis.c index 52355b74..8bac9a03 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.5 2004-03-05 13:39:06 eich Exp $ */ +/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.5.4.1 2004-05-04 19:42:42 ewalsh Exp $ */ /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* @@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group. #include "Xintconn.h" -/* prototyes */ +/* prototypes */ static void GetAuthorization( XtransConnInfo trans_conn, int family, @@ -147,10 +147,10 @@ _X11TransConnectDisplay ( int connect_stat; #ifdef LOCALCONN struct utsname sys; +#endif #ifdef TCPCONN char *tcphostname = NULL; /* A place to save hostname pointer */ #endif -#endif p = display_name; @@ -283,12 +283,18 @@ _X11TransConnectDisplay ( #if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN) if (!pprotocol) { - if (!phostname) + if (!phostname) { #if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) pprotocol = copystring ("local", 5); +#if defined(TCPCONN) + tcphostname = copystring("localhost", 9); +#endif + } else + { #endif pprotocol = copystring ("tcp", 3); + } } #else #if defined(AMRPCCONN) @@ -325,7 +331,7 @@ _X11TransConnectDisplay ( } #endif -#if defined(LOCALCONN) && defined(TCPCONN) +#if defined(TCPCONN) connect: #endif /* @@ -339,6 +345,7 @@ _X11TransConnectDisplay ( (pdpynum ? strlen(pdpynum) : 0); if (olen > sizeof addrbuf) address = Xmalloc (olen); } + if (!address) goto bad; sprintf(address,"%s/%s:%d", pprotocol ? pprotocol : "", @@ -397,6 +404,7 @@ _X11TransConnectDisplay ( } if (address != addrbuf) Xfree (address); + address = addrbuf; if( trans_conn == NULL ) goto bad; @@ -428,6 +436,9 @@ _X11TransConnectDisplay ( if (phostname) Xfree (phostname); if (pdpynum) Xfree (pdpynum); if (pscrnum) Xfree (pscrnum); +#ifdef TCPCONN + if (tcphostname) Xfree (tcphostname); +#endif GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay, auth_namep, auth_namelenp, auth_datap, auth_datalenp); @@ -442,8 +453,9 @@ _X11TransConnectDisplay ( if (saddr) free ((char *) saddr); if (pprotocol) Xfree (pprotocol); if (phostname) Xfree (phostname); + if (address && address != addrbuf) { Xfree(address); address = addrbuf; } -#if defined(LOCALCONN) && defined(TCPCONN) +#if defined(TCPCONN) if (tcphostname) { pprotocol = copystring("tcp", 3); phostname = tcphostname; @@ -580,13 +592,6 @@ _XSendClientPrefix (dpy, client, auth_proto, auth_string, prefix) #endif #ifdef SECURE_RPC -#if defined(sun) && defined(SVR4) /* && ????? */ -/* - * I'm aware this is backwards, but #define'ing PORTMAP, as suggested in the - * man pages, doesn't work either. - */ -#define authdes_seccreate authdes_create -#endif #include <rpc/rpc.h> #ifdef ultrix #include <time.h> @@ -1099,14 +1104,14 @@ GetAuthorization( /* Port number */ for (i=2; i<4; i++) xdmcp_data[j++] = ((char *)addr)[i]; - break; } else { /* Fake data to keep the data aligned. Otherwise the the server will bail about incorrect timing data */ - for (i = 0; i < 8; i++) { + for (i = 0; i < 6; i++) { xdmcp_data[j++] = 0; } } + break; } #endif /* AF_INET6 */ #ifdef AF_UNIX @@ -1,5 +1,5 @@ /* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/Host.c,v 1.1.4.3 2004-04-15 10:14:54 eich Exp $ */ +/* $XdotOrg: lib/X11/src/Host.c,v 1.1.4.2.4.1 2004-05-04 19:42:42 ewalsh Exp $ */ /* Copyright 1986, 1998 The Open Group diff --git a/src/LiHosts.c b/src/LiHosts.c index 31d72d00..3cc29e20 100644 --- a/src/LiHosts.c +++ b/src/LiHosts.c @@ -1,5 +1,5 @@ /* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.1.4.1 2004-04-15 10:14:54 eich Exp $ */ +/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.1.20.1 2004-05-04 19:42:42 ewalsh Exp $ */ /* Copyright 1986, 1998 The Open Group diff --git a/src/SetLocale.c b/src/SetLocale.c index 0971852e..dd419b49 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.5 2004-03-05 13:39:07 eich Exp $ */ +/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.5.4.1 2004-05-04 19:42:42 ewalsh Exp $ */ /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c index 5f218917..1ec4f716 100644 --- a/src/xcms/HVC.c +++ b/src/xcms/HVC.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.4 2004-03-05 13:39:07 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.4.4.1 2004-05-04 19:42:42 ewalsh Exp $ */ /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ /* diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c index 2f74e630..89e28615 100644 --- a/src/xcms/cmsColNm.c +++ b/src/xcms/cmsColNm.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.4 2004-03-05 13:39:08 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.4.4.1 2004-05-04 19:42:43 ewalsh Exp $ */ /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ /* diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c index 7340cd68..d430bc35 100644 --- a/src/xlibi18n/XlcDL.c +++ b/src/xlibi18n/XlcDL.c @@ -42,7 +42,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XlcDL.c,v 1.12 2003/04/13 19:22:19 dawes Exp $ */ -/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.4 2004-03-05 13:39:08 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.4.4.1 2004-05-04 19:42:42 ewalsh Exp $ */ #include <stdio.h> #if defined(hpux) |