xace: remove obsoleted DRAWABLE_ACCESS hook.
This commit is contained in:
parent
8b54865720
commit
50551ec693
|
@ -1836,7 +1836,6 @@ SecurityExtensionInit(INITARGS)
|
|||
XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
|
||||
XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
|
||||
XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
|
||||
XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
|
||||
XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
|
||||
XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
|
||||
XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
|
||||
|
|
10
Xext/xace.c
10
Xext/xace.c
|
@ -105,16 +105,6 @@ int XaceHook(int hook, ...)
|
|||
prv = &rec.status;
|
||||
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: {
|
||||
XaceSendAccessRec rec = {
|
||||
va_arg(ap, ClientPtr),
|
||||
|
|
27
Xext/xace.h
27
Xext/xace.h
|
@ -45,20 +45,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define XACE_RESOURCE_ACCESS 2
|
||||
#define XACE_DEVICE_ACCESS 3
|
||||
#define XACE_PROPERTY_ACCESS 4
|
||||
#define XACE_DRAWABLE_ACCESS 5
|
||||
#define XACE_SEND_ACCESS 6
|
||||
#define XACE_RECEIVE_ACCESS 7
|
||||
#define XACE_CLIENT_ACCESS 8
|
||||
#define XACE_EXT_ACCESS 9
|
||||
#define XACE_SERVER_ACCESS 10
|
||||
#define XACE_SELECTION_ACCESS 11
|
||||
#define XACE_SCREEN_ACCESS 12
|
||||
#define XACE_SCREENSAVER_ACCESS 13
|
||||
#define XACE_AUTH_AVAIL 14
|
||||
#define XACE_KEY_AVAIL 15
|
||||
#define XACE_AUDIT_BEGIN 16
|
||||
#define XACE_AUDIT_END 17
|
||||
#define XACE_NUM_HOOKS 18
|
||||
#define XACE_SEND_ACCESS 5
|
||||
#define XACE_RECEIVE_ACCESS 6
|
||||
#define XACE_CLIENT_ACCESS 7
|
||||
#define XACE_EXT_ACCESS 8
|
||||
#define XACE_SERVER_ACCESS 9
|
||||
#define XACE_SELECTION_ACCESS 10
|
||||
#define XACE_SCREEN_ACCESS 11
|
||||
#define XACE_SCREENSAVER_ACCESS 12
|
||||
#define XACE_AUTH_AVAIL 13
|
||||
#define XACE_KEY_AVAIL 14
|
||||
#define XACE_AUDIT_BEGIN 15
|
||||
#define XACE_AUDIT_END 16
|
||||
#define XACE_NUM_HOOKS 17
|
||||
|
||||
extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
|
||||
|
||||
|
|
|
@ -65,13 +65,6 @@ typedef struct {
|
|||
int status;
|
||||
} XacePropertyAccessRec;
|
||||
|
||||
/* XACE_DRAWABLE_ACCESS */
|
||||
typedef struct {
|
||||
ClientPtr client;
|
||||
DrawablePtr pDraw;
|
||||
int status;
|
||||
} XaceDrawableAccessRec;
|
||||
|
||||
/* XACE_SEND_ACCESS */
|
||||
typedef struct {
|
||||
ClientPtr client;
|
||||
|
|
|
@ -1389,7 +1389,6 @@ XSELinuxExtensionInit(INITARGS)
|
|||
XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
|
||||
XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
|
||||
XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
|
||||
XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
|
||||
XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
|
||||
/* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
|
||||
XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
|
||||
|
|
|
@ -2273,8 +2273,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
|
|||
WriteReplyToClient(client, sizeof (xGetImageReply), &xgi);
|
||||
}
|
||||
|
||||
if (pDraw->type == DRAWABLE_WINDOW &&
|
||||
XaceHook(XACE_DRAWABLE_ACCESS, client, pDraw) != Success)
|
||||
if (pDraw->type == DRAWABLE_WINDOW)
|
||||
{
|
||||
pVisibleRegion = NotClippedByChildren((WindowPtr)pDraw);
|
||||
if (pVisibleRegion)
|
||||
|
|
Loading…
Reference in New Issue
Block a user