summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-01-30 18:45:44 -0800
committerKeith Packard <keithp@neko.keithp.com>2007-01-30 18:45:44 -0800
commit895250181b21a76cab815b6ee2862d8a0c3a2fbf (patch)
tree663403ee3bfdf218ee62ccfbd0a7ea37f0bf5b27
parentf993e142d2b8c7ce27370fb2c18d2eafb6ff40ca (diff)
Use old resource API in backported patch.
1.2 branch doesn't have the resource lookup changes, so we need to use the old APIs.
-rwxr-xr-xdamageext/damageext.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 36d31e825..d13c67b7c 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -281,14 +281,10 @@ ProcDamageAdd (ClientPtr client)
REQUEST(xDamageAddReq);
DrawablePtr pDrawable;
RegionPtr pRegion;
- int rc;
REQUEST_SIZE_MATCH(xDamageAddReq);
- VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess);
- rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
- DixReadAccess);
- if (rc != Success)
- return rc;
+ VERIFY_REGION(pRegion, stuff->region, client, SecurityWriteAccess);
+ SECURITY_VERIFY_DRAWABLE (pDrawable, stuff->drawable, client, SecurityReadAccess);
/* The region is relative to the drawable origin, so translate it out to
* screen coordinates like damage expects.