From 53c14303770ecd39534a73dbed90e4e8fd75423a 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.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 3580852ab..2b106ac2e 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -399,16 +399,6 @@ SELinuxTypeToClass(RESTYPE type) return knownTypes[type]; } -/* - * 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. */ @@ -697,7 +687,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;