diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 09:36:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 15:17:54 +1000 |
| commit | 906fe9547957917ac463d646935473ceca10a72b (patch) | |
| tree | 42f0239c50e98a4ff81102521cbf23664ab2b3ec | |
| parent | c7eb27f3927ba9a36f9904938996f346cca33021 (diff) | |
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>
| -rw-r--r-- | Xi/opendev.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Xi/opendev.c b/Xi/opendev.c index 502bdfc2a..833ecbbb9 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -113,14 +113,8 @@ ProcXOpenDevice(ClientPtr client) } else if (status != Success) return status; - /* Don't let XI 1.x clients open devices other than floating SDs. */ - pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey); - if (pXIClient->major_version < XI_2_Major) - { - if (dev->isMaster || (!dev->isMaster && dev->u.master)) + if (dev->isMaster) return BadDevice; - } - OpenInputDevice(dev, client, &status); if (status != Success) |