aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/security.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2016-06-01 21:57:36 +0200
committerMihai Moldovan <ionic@ionic.de>2016-06-01 21:57:36 +0200
commit3d54338330821a3e60e0f52cce2a9dd1f94f8b5c (patch)
treee1d61f5f14cf5f26f3cf7094c485a5424f0551ea /nx-X11/programs/Xserver/Xext/security.c
parentc646808bcb0fe95e9794409231a9fa8b51990971 (diff)
parentb2145323c189a9c68d475d387fdfac54bcb33c94 (diff)
downloadnx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.gz
nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.bz2
nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.zip
Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into arctica-3.6.x
Attributes GH PR #106: https://github.com/ArcticaProject/nx-libs/pull/106
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/security.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index ccf80b401..13da54386 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -60,14 +60,6 @@ in this Software without prior written authorization from The Open Group.
#include <nx-X11/extensions/securstr.h>
#include <assert.h>
#include <stdarg.h>
-#ifdef LBX
-#define _XLBX_SERVER_
-#include <nx-X11/extensions/XLbx.h>
-extern unsigned char LbxReqCode;
-#endif
-#ifdef XAPPGROUP
-#include <nx-X11/extensions/Xagsrv.h>
-#endif
#include <stdio.h> /* for file reading operations */
#include <nx-X11/Xatom.h> /* for XA_STRING */
@@ -1165,10 +1157,6 @@ SecurityCheckResourceIDAccess(
* use app groups. dpw
*/
if (client->trustLevel == clients[cid]->trustLevel
-#ifdef XAPPGROUP
- || (RT_COLORMAP == rtype &&
- XagDefaultColormap (client) == (Colormap) id)
-#endif
)
return rval;
else
@@ -1231,18 +1219,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);
}
@@ -1343,22 +1319,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