From 264ce9e8360374b3a43442c8bdea08abde705446 Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Wed, 14 Oct 2009 20:33:53 -0400 Subject: [PATCH] xselinux: Use the now-exported IsPointerDevice() instead of a copy. Signed-off-by: Eamon Walsh --- Xext/xselinux_hooks.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c index fd2bfcfdf..43683ff24 100644 --- a/Xext/xselinux_hooks.c +++ b/Xext/xselinux_hooks.c @@ -86,16 +86,6 @@ static void SELinuxScreen(CallbackListPtr *, pointer, pointer); static pointer truep = (pointer)1; -/* - * Returns true if device is a pointer device. - * Note: this duplicates dix IsPointerDevice() which is not exported. - */ -static inline Bool -IsPointerDev(DeviceIntPtr dev) -{ - return (dev->type == MASTER_POINTER) || (dev->valuator && dev->button); -} - /* * Performs an SELinux permission check. */ @@ -383,7 +373,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) } } - cls = IsPointerDev(rec->dev) ? SECCLASS_X_POINTER : SECCLASS_X_KEYBOARD; + cls = IsPointerDevice(rec->dev) ? SECCLASS_X_POINTER : SECCLASS_X_KEYBOARD; rc = SELinuxDoCheck(subj, obj, cls, rec->access_mode, &auditdata); if (rc != Success) rec->status = rc;