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-14 20:33:53 -0400 |
| commit | 264ce9e8360374b3a43442c8bdea08abde705446 (patch) | |
| tree | 62413f04416199e6c9737df2aa819ab689fbb717 /Xext/xselinux_hooks.c | |
| parent | 0ae1632be045bfbb288bb57190c830f94247460f (diff) | |
xselinux: Use the now-exported IsPointerDevice() instead of a copy.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Diffstat (limited to 'Xext/xselinux_hooks.c')
| -rw-r--r-- | Xext/xselinux_hooks.c | 12 |
1 files changed, 1 insertions, 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 @@ -87,16 +87,6 @@ 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. */ static int @@ -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; |