summaryrefslogtreecommitdiff
path: root/dix/property.c
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-10-10 19:43:12 -0400
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-10-10 19:43:12 -0400
commit473bc6ec4c59e1a962b0b897c449a69aa5064ab0 (patch)
tree89a13cebca8bf7c5004ffacd679a7d683364a3c2 /dix/property.c
parent7e9e01a4a34fa45521067d43c5bbff942dd5d51a (diff)
xace: remove the special-cased "ignore" functionality from the property code.
There will be no more faking of Success to hide things. XACE does not provide polyinstantiation.
Diffstat (limited to 'dix/property.c')
-rw-r--r--dix/property.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/dix/property.c b/dix/property.c
index 5f12dec3c..cff51d894 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -161,7 +161,7 @@ ProcRotateProperties(ClientPtr client)
if (rc != Success) {
DEALLOCATE_LOCAL(props);
client->errorValue = atoms[i];
- return (rc == XaceIgnoreError) ? Success : rc;
+ return rc;
}
props[i] = pProp;
}
@@ -282,7 +282,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
xfree(data);
xfree(pProp);
pClient->errorValue = property;
- return (rc == XaceIgnoreError) ? Success : rc;
+ return rc;
}
pProp->next = pWin->optional->userProps;
pWin->optional->userProps = pProp;
@@ -293,7 +293,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
DixWriteAccess);
if (rc != Success) {
pClient->errorValue = property;
- return (rc == XaceIgnoreError) ? Success : rc;
+ return rc;
}
/* To append or prepend to a property the request format and type
must match those of the already defined property. The
@@ -499,8 +499,7 @@ ProcGetProperty(ClientPtr client)
rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode);
if (rc != Success) {
client->errorValue = stuff->property;
- return (rc == XaceIgnoreError) ?
- NullPropertyReply(client, pProp->type, pProp->format, &reply) : rc;
+ return rc;
}
/* If the request type and actual type don't match. Return the
@@ -641,7 +640,7 @@ ProcDeleteProperty(ClientPtr client)
FindProperty(pWin, stuff->property), DixDestroyAccess);
if (result != Success) {
client->errorValue = stuff->property;
- return (result == XaceIgnoreError) ? Success : result;
+ return result;
}
result = DeleteProperty(pWin, stuff->property);