frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiple warnings in os/xdmauth.c.

This commit is contained in:
Eamon Walsh 2008-06-13 21:59:09 -04:00 committed by Eamon Walsh
parent 384ebe02b3
commit 1c2f038d69
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/xdmauth.c
View File

@ -69,7 +69,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData,
{ {
XdmAuthKeyPtr incoming; XdmAuthKeyPtr incoming;
XdmcpUnwrap (incomingData->data, &privateKey, XdmcpUnwrap (incomingData->data, (unsigned char *)&privateKey,
incomingData->data,incomingData->length); incomingData->data,incomingData->length);
if (packet_type == ACCEPT) { if (packet_type == ACCEPT) {
if (incomingData->length != 8) if (incomingData->length != 8)
@ -89,7 +89,8 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData,
outgoingData->data = 0; outgoingData->data = 0;
if (packet_type == REQUEST) { if (packet_type == REQUEST) {
if (XdmcpAllocARRAY8 (outgoingData, 8)) if (XdmcpAllocARRAY8 (outgoingData, 8))
XdmcpWrap (&rho, &privateKey, outgoingData->data, 8); XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,
outgoingData->data, 8);
} }
return TRUE; return TRUE;
} }
@ -99,7 +100,8 @@ XdmAuthenticationAddAuth (int name_len, char *name,
int data_len, char *data) int data_len, char *data)
{ {
Bool ret; Bool ret;
XdmcpUnwrap (data, (unsigned char *)&privateKey, data, data_len); XdmcpUnwrap ((unsigned char *)data, (unsigned char *)&privateKey,
(unsigned char *)data, data_len);
authFromXDMCP = TRUE; authFromXDMCP = TRUE;
ret = AddAuthorization (name_len, name, data_len, data); ret = AddAuthorization (name_len, name, data_len, data);
authFromXDMCP = FALSE; authFromXDMCP = FALSE;
@ -152,7 +154,7 @@ XdmAuthenticationInit (char *cookie, int cookie_len)
} }
XdmcpGenerateKey (&rho); XdmcpGenerateKey (&rho);
XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen, XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
(unsigned char *)&rho, (char *)&rho,
sizeof (rho), sizeof (rho),
(ValidatorFunc)XdmAuthenticationValidator, (ValidatorFunc)XdmAuthenticationValidator,
(GeneratorFunc)XdmAuthenticationGenerator, (GeneratorFunc)XdmAuthenticationGenerator,
@ -387,7 +389,7 @@ XdmCheckCookie (unsigned short cookie_length, char *cookie,
if (!plain) if (!plain)
return (XID) -1; return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) { for (auth = xdmAuth; auth; auth=auth->next) {
XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length); XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL) if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL)
{ {
client->next = xdmClients; client->next = xdmClients;
@ -432,7 +434,7 @@ XdmToID (unsigned short cookie_length, char *cookie)
if (!plain) if (!plain)
return (XID) -1; return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) { for (auth = xdmAuth; auth; auth=auth->next) {
XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length); XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL) if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)
{ {
xfree (client); xfree (client);