xace: add hooks + new access codes: TOG-CUP extension.

This commit is contained in:
Eamon Walsh 2007-08-29 14:40:10 -04:00 committed by Eamon Walsh
parent e39694789e
commit 4795df6245

View File

@ -224,12 +224,13 @@ int ProcStoreColors(
{ {
REQUEST (xXcupStoreColorsReq); REQUEST (xXcupStoreColorsReq);
ColormapPtr pcmp; ColormapPtr pcmp;
int rc;
REQUEST_AT_LEAST_SIZE (xXcupStoreColorsReq); REQUEST_AT_LEAST_SIZE (xXcupStoreColorsReq);
pcmp = (ColormapPtr) SecurityLookupIDByType (client, stuff->cmap, rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP,
RT_COLORMAP, DixWriteAccess); client, DixAddAccess);
if (pcmp) { if (rc == Success) {
int ncolors, n; int ncolors, n;
xXcupStoreColorsReply rep; xXcupStoreColorsReply rep;
xColorItem* cptr; xColorItem* cptr;
@ -273,7 +274,7 @@ int ProcStoreColors(
return client->noClientException; return client->noClientException;
} else { } else {
client->errorValue = stuff->cmap; client->errorValue = stuff->cmap;
return BadColor; return (rc == BadValue) ? BadColor : rc;
} }
} }