hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
This commit is contained in:
Peter Hutterer 2008-04-22 18:04:05 +09:30
commit 8190ef8754
195 changed files with 2129 additions and 36734 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Xext/security.c
View file

@ -38,9 +38,6 @@ in this Software without prior written authorization from The Open Group.
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securstr.h>
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
#include "modinit.h"
/* Extension stuff */
@ -833,11 +830,6 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
if (SecurityDoCheck(subj, obj, requested, allowed) == Success)
return;
#ifdef XAPPGROUP
if (rec->id == XagDefaultColormap(rec->client))
return;
#endif
SecurityAudit("Security: denied client %d access %x to resource 0x%x "
"of client %d on request %s\n", rec->client->index,
requested, rec->id, cid,