diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-10-14 20:33:53 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-10-21 20:54:28 -0400 |
| commit | 53c14303770ecd39534a73dbed90e4e8fd75423a (patch) | |
| tree | 96d90bb176d7c7a3872dadf40ec1c14b50f89b23 | |
| parent | 951a16c51e8f62e83c84100f6e2eec09ec8b101a (diff) | |
xselinux: Use the now-exported IsPointerDevice() instead of a copy.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
| -rw-r--r-- | Xext/xselinux.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 3580852ab..2b106ac2e 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -400,16 +400,6 @@ SELinuxTypeToClass(RESTYPE 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. */ static int @@ -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; |