diff options
Diffstat (limited to 'xorg-server/Xext/security.c')
| -rw-r--r-- | xorg-server/Xext/security.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c index 1e0bfefb9..8a82806e9 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/Xext/security.c @@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group. #include "xacestr.h" #include "securitysrv.h" #include <X11/extensions/securproto.h> -#include "modinit.h" +#include "extinit.h" #include "protocol-versions.h" /* Extension stuff */ @@ -195,9 +195,9 @@ SecurityDeleteAuthorization(pointer value, XID id) while ((pEventClient = pAuth->eventClients)) { /* send revocation event event */ xSecurityAuthorizationRevokedEvent are; - are.type = SecurityEventBase + XSecurityAuthorizationRevoked; are.authId = pAuth->id; + WriteEventsToClient(rClient(pEventClient), 1, (xEvent *) &are); FreeResource(pEventClient->resource, RT_NONE); } @@ -353,8 +353,7 @@ ProcSecurityQueryVersion(ClientPtr client) swaps(&rep.majorVersion); swaps(&rep.minorVersion); } - (void) WriteToClient(client, SIZEOF(xSecurityQueryVersionReply), - (char *) &rep); + WriteToClient(client, SIZEOF(xSecurityQueryVersionReply), &rep); return Success; } /* ProcSecurityQueryVersion */ @@ -530,9 +529,10 @@ ProcSecurityGenerateAuthorization(ClientPtr client) /* tell client the auth id and data */ + rep.type = X_Reply; - rep.length = bytes_to_int32(authdata_len); rep.sequenceNumber = client->sequence; + rep.length = bytes_to_int32(authdata_len); rep.authId = authId; rep.dataLength = authdata_len; @@ -543,8 +543,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client) swaps(&rep.dataLength); } - WriteToClient(client, SIZEOF(xSecurityGenerateAuthorizationReply), - (char *) &rep); + WriteToClient(client, SIZEOF(xSecurityGenerateAuthorizationReply), &rep); WriteToClient(client, authdata_len, pAuthdata); SecurityAudit @@ -1027,7 +1026,7 @@ SecurityResetProc(ExtensionEntry * extEntry) */ void -SecurityExtensionInit(INITARGS) +SecurityExtensionInit(void) { ExtensionEntry *extEntry; int ret = TRUE; |