Xi: don't allow OpenDevice on any MD.

This restores the original behaviour of XI 1. Any slave device may be opened,
but none of the MDs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-03-20 09:36:09 +10:00
parent c7eb27f392
commit 906fe95479

View File

@ -113,14 +113,8 @@ ProcXOpenDevice(ClientPtr client)
} else if (status != Success) } else if (status != Success)
return status; return status;
/* Don't let XI 1.x clients open devices other than floating SDs. */ if (dev->isMaster)
pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
if (pXIClient->major_version < XI_2_Major)
{
if (dev->isMaster || (!dev->isMaster && dev->u.master))
return BadDevice; return BadDevice;
}
OpenInputDevice(dev, client, &status); OpenInputDevice(dev, client, &status);
if (status != Success) if (status != Success)