diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-05 11:18:36 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-05 11:18:36 -0400 |
| commit | 0003ccfcdfae1b473aa024342304b84256d378b9 (patch) | |
| tree | 17e716298c24649d85a2ab9bd0a7826f7cc3005a /dix/cursor.c | |
| parent | ce9e83d913511fe619da42f805d7bcd1a2a60d90 (diff) | |
xace: add new fields to resource access hook to allow parent resource objects
to be passed in at create time. Also added a missing devPrivates initializer.
Diffstat (limited to 'dix/cursor.c')
| -rw-r--r-- | dix/cursor.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index 324faa169..0ddf9d791 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -212,12 +212,12 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits, pCurs->backGreen = backGreen; pCurs->backBlue = backBlue; - pCurs->devPrivates = NULL; pCurs->id = cid; + pCurs->devPrivates = NULL; /* security creation/labeling check */ rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, - DixCreateAccess, pCurs); + pCurs, RT_NONE, NULL, DixCreateAccess); if (rc != Success) { dixFreePrivates(pCurs->devPrivates); FreeCursorBits(bits); @@ -365,6 +365,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, bits->height = cm.height; bits->xhot = cm.xhot; bits->yhot = cm.yhot; + bits->devPrivates = NULL; if (sourcefont != maskfont) bits->refcnt = -1; else @@ -406,7 +407,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, /* security creation/labeling check */ rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, - DixCreateAccess, pCurs); + pCurs, RT_NONE, NULL, DixCreateAccess); if (rc != Success) { dixFreePrivates(pCurs->devPrivates); FreeCursorBits(bits); |