Module Name:	xsrc
Committed By:	itojun
Date:		Tue Jul 25 11:46:15 UTC 2000

Modified Files:
	xsrc/xc/programs/Xserver/xkb: ddxLoad.c xkbInit.c

Log Message:
pull patch from OpenBSD SA 2000-021.
ftp://ftp.openbsd.org/pub/OpenBSD/patches/2.7/common/021_X11_libs.patch

NOTE: i'm not sure the following commit log applies to netbsd.

openbsd X11/xc/programs/Xserver/xkb/ddxLoad.c 1.1 -> 1.2
openbsd X11/xc/programs/Xserver/xkb/xkbInit.c 1.1 -> 1.3

fix by Trevor Johnson for a possible overflow with -xkbmap reported by
Michal Zalewski on bugtraq.

Note that the default install (using the XFree86 setuid Xwrapper, not
the RedHat one) is not vulnerable since the wrapper rejects argments
exceeding 128 chars.


To generate a diff of this commit:
cvs rdiff -r1.1.1.5 -r1.2 xsrc/xc/programs/Xserver/xkb/ddxLoad.c
cvs rdiff -r1.1.1.3 -r1.2 xsrc/xc/programs/Xserver/xkb/xkbInit.c

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