diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
commit | 8190ef87547b704848231bde10b1cdffc6442790 (patch) | |
tree | 29cb6d5bdefcee879d103953a140373635726f17 /Xext/security.c | |
parent | 179a082c26f9e562492ee2e59e7f44f949f39f9c (diff) | |
parent | 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3 (diff) |
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
Diffstat (limited to 'Xext/security.c')
-rw-r--r-- | Xext/security.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Xext/security.c b/Xext/security.c index 160d954c9..f28b10dee 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -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, |