summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-08-26 15:51:46 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-08-30 14:26:55 +1000
commit94d4e29aedc69431fa9b299ca1b67947173d7a24 (patch)
treed4a0c69e277cebb2d24fe389c13175bbbb4e5ee0 /Xi
parent82939e02392cbb880313fe92957091ff89ce2f2b (diff)
Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554)
XIAllowEvents changed length in XI 2.2 (for the touchid). A bug in libXi causes libXi to always use the new request length if the server supports 2.2, regardless of the client's XIQueryVersion request. The server takes the client's XIQueryVersion request into account though, resulting in a BadLength error if a 2.[0,1] client calls XIAllowEvents on a XI 2.2+ server. Can't fix this in libXi, so work around this in the server. X.Org Bug 68554 <http://bugs.freedesktop.org/show_bug.cgi?id=68554> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/xiallowev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 62a0727b0..ebef23344 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -81,7 +81,7 @@ ProcXIAllowEvents(ClientPtr client)
have_xi22 = TRUE;
}
else {
- REQUEST_SIZE_MATCH(xXIAllowEventsReq);
+ REQUEST_AT_LEAST_SIZE(xXIAllowEventsReq);
}
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);