From 683415dfe516f14a6825a1f6f14af03f44192727 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 19 Apr 2016 11:05:41 +0200
Subject: XAPPGROUP: Drop all Xserver code blocks that relate to removed
 XAPPGROUP extension.

---
 nx-X11/programs/Xserver/Xext/security.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xext/security.c')

diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index ccf80b401..55d59a4ee 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -65,9 +65,6 @@ in this Software without prior written authorization from The Open Group.
 #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 +1162,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
-- 
cgit v1.2.3


From 2f0d2d388638dbad4db35cd07979955909ed3dbb Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 19 Apr 2016 11:52:13 +0200
Subject: LBX: Drop all Xserver code blocks that relate to removed LBX
 extension.

---
 nx-X11/programs/Xserver/Xext/security.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xext/security.c')

diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 55d59a4ee..13da54386 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -60,11 +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
 #include <stdio.h>  /* for file reading operations */
 #include <nx-X11/Xatom.h>  /* for XA_STRING */
 
@@ -1224,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);
 		}
@@ -1336,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
-- 
cgit v1.2.3