svn merge "^/branches/released" .

1 files changed, 7 insertions, 12 deletions

diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 90caa3ced..1eecf4a6e 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -200,16 +200,10 @@ SecurityDeleteAuthorization(
     while ((pEventClient = pAuth->eventClients))

     {

 	/* send revocation event event */

-	ClientPtr client = rClient(pEventClient);

-

-	if (!client->clientGone)

-	{

-	    xSecurityAuthorizationRevokedEvent are;

-	    are.type = SecurityEventBase + XSecurityAuthorizationRevoked;

-	    are.sequenceNumber = client->sequence;

-	    are.authId = pAuth->id;

-	    WriteEventsToClient(client, 1, (xEvent *)&are);

-	}

+	xSecurityAuthorizationRevokedEvent are;

+	are.type = SecurityEventBase + XSecurityAuthorizationRevoked;

+	are.authId = pAuth->id;

+	WriteEventsToClient(rClient(pEventClient), 1, (xEvent *)&are);

 	FreeResource(pEventClient->resource, RT_NONE);

     }

 

@@ -631,8 +625,7 @@ ProcSecurityRevokeAuthorization(
 				 SecurityAuthorizationResType, client,

 				 DixDestroyAccess);

     if (rc != Success)

-	return (rc == BadValue) ?

-	    SecurityErrorBase + XSecurityBadAuthorization : rc;

+	return rc;

 

     FreeResource(stuff->authId, RT_NONE);

     return Success;

@@ -1148,6 +1141,8 @@ SecurityExtensionInit(INITARGS)
     EventSwapVector[SecurityEventBase + XSecurityAuthorizationRevoked] =

 	(EventSwapPtr)SwapSecurityAuthorizationRevokedEvent;

 

+    SetResourceTypeErrorValue(SecurityAuthorizationResType, SecurityErrorBase + XSecurityBadAuthorization);

+

     /* Label objects that were created before we could register ourself */

     SecurityLabelInitial();

 }