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

xace: add hooks + new access codes: core protocol property requests

This commit is contained in:
Eamon Walsh 2007-08-14 13:20:42 -04:00 committed by Eamon Walsh
parent 42d6112ec2
commit b424e01ec5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dix/property.c
View File

@ -129,7 +129,7 @@ ProcRotateProperties(ClientPtr client)
REQUEST_FIXED_SIZE(xRotatePropertiesReq, stuff->nAtoms << 2); REQUEST_FIXED_SIZE(xRotatePropertiesReq, stuff->nAtoms << 2);
UpdateCurrentTime(); UpdateCurrentTime();
rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
if (!stuff->nAtoms) if (!stuff->nAtoms)
@ -217,7 +217,7 @@ ProcChangeProperty(ClientPtr client)
totalSize = len * sizeInBytes; totalSize = len * sizeInBytes;
REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize); REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize);
err = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); err = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
if (err != Success) if (err != Success)
return err; return err;
if (!ValidAtom(stuff->property)) if (!ValidAtom(stuff->property))
@ -277,7 +277,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
pProp->size = len; pProp->size = len;
pProp->devPrivates = NULL; pProp->devPrivates = NULL;
rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
DixCreateAccess); DixCreateAccess|DixWriteAccess);
if (rc != Success) { if (rc != Success) {
xfree(data); xfree(data);
xfree(pProp); xfree(pProp);
@ -449,13 +449,15 @@ ProcGetProperty(ClientPtr client)
int rc; int rc;
WindowPtr pWin; WindowPtr pWin;
xGetPropertyReply reply; xGetPropertyReply reply;
Mask access_mode = DixReadAccess; Mask access_mode = DixGetPropAccess;
REQUEST(xGetPropertyReq); REQUEST(xGetPropertyReq);
REQUEST_SIZE_MATCH(xGetPropertyReq); REQUEST_SIZE_MATCH(xGetPropertyReq);
if (stuff->delete) if (stuff->delete) {
UpdateCurrentTime(); UpdateCurrentTime();
rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); access_mode |= DixSetPropAccess;
}
rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -490,6 +492,7 @@ ProcGetProperty(ClientPtr client)
if (!pProp) if (!pProp)
return NullPropertyReply(client, None, 0, &reply); return NullPropertyReply(client, None, 0, &reply);
access_mode = DixReadAccess;
if (stuff->delete) if (stuff->delete)
access_mode |= DixDestroyAccess; access_mode |= DixDestroyAccess;
@ -581,7 +584,7 @@ ProcListProperties(ClientPtr client)
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess); rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -625,7 +628,7 @@ ProcDeleteProperty(ClientPtr client)
REQUEST_SIZE_MATCH(xDeletePropertyReq); REQUEST_SIZE_MATCH(xDeletePropertyReq);
UpdateCurrentTime(); UpdateCurrentTime();
result = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); result = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
if (result != Success) if (result != Success)
return result; return result;
if (!ValidAtom(stuff->property)) if (!ValidAtom(stuff->property))