diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-22 17:33:16 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-22 17:33:16 -0400 |
| commit | e1cc68add0bcdd5e0e4e15cf6ee8a3da136d3534 (patch) | |
| tree | c6803e459ca005a2d6f75bd6d51e67fecb3bd5b6 /dix/property.c | |
| parent | c9fb8a35332d101897607d8f06ed5a6512eac7cf (diff) | |
xace: drop the name argument from the property callback.
Diffstat (limited to 'dix/property.c')
| -rw-r--r-- | dix/property.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dix/property.c b/dix/property.c index c760ef188..9ff6993e6 100644 --- a/dix/property.c +++ b/dix/property.c @@ -144,7 +144,7 @@ ProcRotateProperties(ClientPtr client) DEALLOCATE_LOCAL(props); return BadMatch; } - switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, atoms[i], + switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, DixReadAccess|DixWriteAccess)) { case XaceErrorOperation: @@ -277,8 +277,8 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, memmove((char *)data, (char *)value, totalSize); pProp->size = len; pProp->devPrivates = NULL; - switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property, - DixWriteAccess)) + switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, + DixCreateAccess)) { case XaceErrorOperation: xfree(data); @@ -295,7 +295,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, } else { - switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property, + switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, DixWriteAccess)) { case XaceErrorOperation: @@ -517,8 +517,7 @@ ProcGetProperty(ClientPtr client) if (stuff->delete) access_mode |= DixDestroyAccess; - switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, - stuff->property, access_mode)) + switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode)) { case XaceErrorOperation: client->errorValue = stuff->property; @@ -671,8 +670,7 @@ ProcDeleteProperty(register ClientPtr client) } switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, - FindProperty(pWin, stuff->property), stuff->property, - DixDestroyAccess)) + FindProperty(pWin, stuff->property), DixDestroyAccess)) { case XaceErrorOperation: client->errorValue = stuff->property; |