frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xace: remove obsoleted DRAWABLE_ACCESS hook.

This commit is contained in:
Eamon Walsh 2007-09-28 15:04:33 -04:00 committed by Eamon Walsh
parent 8b54865720
commit 50551ec693
6 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/security.c
View File

@ -1836,7 +1836,6 @@ SecurityExtensionInit(INITARGS)
XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL); XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL); XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL); XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL); XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL); XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL); XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);

10
Xext/xace.c
View File

@ -105,16 +105,6 @@ int XaceHook(int hook, ...)
prv = &rec.status; prv = &rec.status;
break; break;
} }
case XACE_DRAWABLE_ACCESS: {
XaceDrawableAccessRec rec = {
va_arg(ap, ClientPtr),
va_arg(ap, DrawablePtr),
Success /* default allow */
};
calldata = &rec;
prv = &rec.status;
break;
}
case XACE_SEND_ACCESS: { case XACE_SEND_ACCESS: {
XaceSendAccessRec rec = { XaceSendAccessRec rec = {
va_arg(ap, ClientPtr), va_arg(ap, ClientPtr),

27
Xext/xace.h
View File

@ -45,20 +45,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_RESOURCE_ACCESS 2 #define XACE_RESOURCE_ACCESS 2
#define XACE_DEVICE_ACCESS 3 #define XACE_DEVICE_ACCESS 3
#define XACE_PROPERTY_ACCESS 4 #define XACE_PROPERTY_ACCESS 4
#define XACE_DRAWABLE_ACCESS 5 #define XACE_SEND_ACCESS 5
#define XACE_SEND_ACCESS 6 #define XACE_RECEIVE_ACCESS 6
#define XACE_RECEIVE_ACCESS 7 #define XACE_CLIENT_ACCESS 7
#define XACE_CLIENT_ACCESS 8 #define XACE_EXT_ACCESS 8
#define XACE_EXT_ACCESS 9 #define XACE_SERVER_ACCESS 9
#define XACE_SERVER_ACCESS 10 #define XACE_SELECTION_ACCESS 10
#define XACE_SELECTION_ACCESS 11 #define XACE_SCREEN_ACCESS 11
#define XACE_SCREEN_ACCESS 12 #define XACE_SCREENSAVER_ACCESS 12
#define XACE_SCREENSAVER_ACCESS 13 #define XACE_AUTH_AVAIL 13
#define XACE_AUTH_AVAIL 14 #define XACE_KEY_AVAIL 14
#define XACE_KEY_AVAIL 15 #define XACE_AUDIT_BEGIN 15
#define XACE_AUDIT_BEGIN 16 #define XACE_AUDIT_END 16
#define XACE_AUDIT_END 17 #define XACE_NUM_HOOKS 17
#define XACE_NUM_HOOKS 18
extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];

7
Xext/xacestr.h
View File

@ -65,13 +65,6 @@ typedef struct {
int status; int status;
} XacePropertyAccessRec; } XacePropertyAccessRec;
/* XACE_DRAWABLE_ACCESS */
typedef struct {
ClientPtr client;
DrawablePtr pDraw;
int status;
} XaceDrawableAccessRec;
/* XACE_SEND_ACCESS */ /* XACE_SEND_ACCESS */
typedef struct { typedef struct {
ClientPtr client; ClientPtr client;

1
Xext/xselinux.c
View File

@ -1389,7 +1389,6 @@ XSELinuxExtensionInit(INITARGS)
XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL); XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL); XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL); XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL); XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
/* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL); /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */ XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */

3
dix/dispatch.c
View File

@ -2273,8 +2273,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
WriteReplyToClient(client, sizeof (xGetImageReply), &xgi); WriteReplyToClient(client, sizeof (xGetImageReply), &xgi);
} }
if (pDraw->type == DRAWABLE_WINDOW && if (pDraw->type == DRAWABLE_WINDOW)
XaceHook(XACE_DRAWABLE_ACCESS, client, pDraw) != Success)
{ {
pVisibleRegion = NotClippedByChildren((WindowPtr)pDraw); pVisibleRegion = NotClippedByChildren((WindowPtr)pDraw);
if (pVisibleRegion) if (pVisibleRegion)