From 895250181b21a76cab815b6ee2862d8a0c3a2fbf Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 30 Jan 2007 18:45:44 -0800 Subject: [PATCH] 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. --- damageext/damageext.c | 8 ++------ 1 file 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.