diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-01 21:12:21 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-12-01 21:15:41 -0500 |
| commit | ac90ce58ba1da3ed605adf75f4d54c34b578c402 (patch) | |
| tree | 3f98bd454b521263786e9bd4f3d17187c80f39a9 /dix | |
| parent | f44f14fe564d834568a0afefba944223a73ea0f5 (diff) | |
Naming change: Security*Operation -> Xace*Operation
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/property.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dix/property.c b/dix/property.c index 0946b65e1..00d485655 100644 --- a/dix/property.c +++ b/dix/property.c @@ -119,12 +119,12 @@ ProcRotateProperties(ClientPtr client) char action = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, atoms[i], SecurityReadAccess|SecurityWriteAccess); - if (!ValidAtom(atoms[i]) || (SecurityErrorOperation == action)) { + if (!ValidAtom(atoms[i]) || (XaceErrorOperation == action)) { DEALLOCATE_LOCAL(props); client->errorValue = atoms[i]; return BadAtom; } - if (SecurityIgnoreOperation == action) { + if (XaceIgnoreOperation == action) { DEALLOCATE_LOCAL(props); return Success; } @@ -226,10 +226,10 @@ ProcChangeProperty(ClientPtr client) switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property, SecurityWriteAccess)) { - case SecurityErrorOperation: + case XaceErrorOperation: client->errorValue = stuff->property; return BadAtom; - case SecurityIgnoreOperation: + case XaceIgnoreOperation: return Success; } @@ -495,10 +495,10 @@ ProcGetProperty(ClientPtr client) switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property, access_mode)) { - case SecurityErrorOperation: + case XaceErrorOperation: client->errorValue = stuff->property; return BadAtom;; - case SecurityIgnoreOperation: + case XaceIgnoreOperation: return NullPropertyReply(client, pProp->type, pProp->format, &reply); } @@ -649,10 +649,10 @@ ProcDeleteProperty(register ClientPtr client) switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property, SecurityDestroyAccess)) { - case SecurityErrorOperation: + case XaceErrorOperation: client->errorValue = stuff->property; return BadAtom;; - case SecurityIgnoreOperation: + case XaceIgnoreOperation: return Success; } |