diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-06-01 22:06:41 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-06-01 22:06:41 +0000 |
| commit | a9ed5a87902a839a5a135af03db78f113b18bd86 (patch) | |
| tree | b5144cf8f4a1e896c6bf5d70873ac2acf61d0ec6 /Xext | |
| parent | df6da66525836d515f408a82f1a13ca5251ff0f7 (diff) | |
Kill LBX, too.
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/security.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/Xext/security.c b/Xext/security.c index d3e9b4ff3..48a45d0a2 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.5 2005/07/03 07:01:04 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.6 2006/03/28 01:20:59 ajax Exp $ */ /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* @@ -43,11 +43,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/securstr.h> #include <assert.h> #include <stdarg.h> -#ifdef LBX -#define _XLBX_SERVER_ -#include <X11/extensions/XLbx.h> -extern unsigned char LbxReqCode; -#endif #ifdef XAPPGROUP #include <X11/extensions/Xagsrv.h> #endif @@ -1066,18 +1061,6 @@ SecurityCheckResourceIDAccess( default: { -#ifdef LBX - /* XXX really need per extension dispatching */ - if (reqtype == LbxReqCode) { - switch (((xReq *)client->requestBuffer)->data) { - case X_LbxGetProperty: - case X_LbxChangeProperty: - return rval; - default: - break; - } - } -#endif /* others not allowed */ return SecurityAuditResourceIDAccess(client, id); } @@ -1178,22 +1161,6 @@ SecurityClientStateCallback( } } /* SecurityClientStateCallback */ -#ifdef LBX -Bool -SecuritySameLevel(client, authId) - ClientPtr client; - XID authId; -{ - SecurityAuthorizationPtr pAuth; - - pAuth = (SecurityAuthorizationPtr)LookupIDByType(authId, - SecurityAuthorizationResType); - if (pAuth) - return client->trustLevel == pAuth->trustLevel; - return client->trustLevel == XSecurityClientTrusted; -} -#endif - /* SecurityCensorImage * * Called after pScreen->GetImage to prevent pieces or trusted windows from |