Module Name:	xsrc
Committed By:	itojun
Date:		Fri Sep 13 09:41:14 UTC 2002

Modified Files:
	xsrc/xc/config/cf: Imake.tmpl
	xsrc/xc/doc/specs/Xext: mit-shm.ms
	xsrc/xc/programs/Xserver/Xext: shm.c
	xsrc/xc/programs/Xserver/include: os.h
	xsrc/xc/programs/Xserver/os: Imakefile access.c

Log Message:
pull in 4.2.1 erratta (affects 3.3.6 too)

  * 4.2.1 Errata
      + The MIT-SHM update in 4.2.1 is incomplete. The case where the X server
        is started from xdm was not handled. A more complete fix from XFree86
        trunk has committed to the xf-4_2-branch branch.
        A source patch against 4.2.1 is available on the XFree86 FTP site.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 xsrc/xc/config/cf/Imake.tmpl
cvs rdiff -r1.1.1.1 -r1.2 xsrc/xc/doc/specs/Xext/mit-shm.ms
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/Xext/shm.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/include/os.h
cvs rdiff -r1.1.1.5 -r1.2 xsrc/xc/programs/Xserver/os/Imakefile
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/os/access.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.