From da728f2127aaa5c1ed5d22bb9f3d0c8ff19e4933 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 14 May 2008 15:17:05 +0930 Subject: [PATCH] dix: don't use serverClient in AddInputDevice, use the one supplied instead. We pass in the client that wants to create the device anyway, lets use the parameter instead of hardcoding the serverClient. Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't have enough coffee that day. --- dix/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/devices.c b/dix/devices.c index 82eece7e0..644ee29a0 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -169,7 +169,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) /* security creation/labeling check */ - if (XaceHook(XACE_DEVICE_ACCESS, serverClient, dev, DixCreateAccess)) { + if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixCreateAccess)) { xfree(dev); return NULL; }