Oops, in previous commit I forgot to remove the actual implementation
of the unused *ToID functions(). Spotted by Adam Jackson on xorg-devel list. Thanks.
This commit is contained in:
parent
9371a727ad
commit
da8f098a38
@ -97,19 +97,6 @@ MitResetCookie(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
XID
|
||||
MitToID(unsigned short data_length, char *data)
|
||||
{
|
||||
struct auth *auth;
|
||||
|
||||
for (auth = mit_auth; auth; auth = auth->next) {
|
||||
if (data_length == auth->len &&
|
||||
memcmp(data, auth->data, data_length) == 0)
|
||||
return auth->id;
|
||||
}
|
||||
return (XID) -1;
|
||||
}
|
||||
|
||||
int
|
||||
MitFromID(XID id, unsigned short *data_lenp, char **datap)
|
||||
{
|
||||
|
@ -175,12 +175,6 @@ SecureRPCReset(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
_X_HIDDEN XID
|
||||
SecureRPCToID(unsigned short data_length, char *data)
|
||||
{
|
||||
return rpc_id;
|
||||
}
|
||||
|
||||
_X_HIDDEN int
|
||||
SecureRPCFromID(XID id, unsigned short *data_lenp, char **datap)
|
||||
{
|
||||
|
@ -411,33 +411,6 @@ XdmResetCookie(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
XID
|
||||
XdmToID(unsigned short cookie_length, char *cookie)
|
||||
{
|
||||
XdmAuthorizationPtr auth;
|
||||
XdmClientAuthPtr client;
|
||||
unsigned char *plain;
|
||||
|
||||
plain = malloc(cookie_length);
|
||||
if (!plain)
|
||||
return (XID) -1;
|
||||
for (auth = xdmAuth; auth; auth = auth->next) {
|
||||
XdmcpUnwrap((unsigned char *) cookie, (unsigned char *) &auth->key,
|
||||
plain, cookie_length);
|
||||
if ((client =
|
||||
XdmAuthorizationValidate(plain, cookie_length, &auth->rho, NULL,
|
||||
NULL)) != NULL) {
|
||||
free(client);
|
||||
free(cookie);
|
||||
free(plain);
|
||||
return auth->id;
|
||||
}
|
||||
}
|
||||
free(cookie);
|
||||
free(plain);
|
||||
return (XID) -1;
|
||||
}
|
||||
|
||||
int
|
||||
XdmFromID(XID id, unsigned short *data_lenp, char **datap)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user