From 906fe9547957917ac463d646935473ceca10a72b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 20 Mar 2009 09:36:09 +1000 Subject: [PATCH] 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 --- Xi/opendev.c | 8 +------- 1 file changed, 1 insertion(+), 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)