andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xselinux: Use the now-exported IsPointerDevice() instead of a copy. 

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
This commit is contained in:
Eamon Walsh 2009-10-14 20:33:53 -04:00
parent 951a16c51e
commit 53c1430377
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/xselinux.c
View File

@ -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;