diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-02-26 22:00:52 -0500 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2008-02-26 22:00:52 -0500 |
commit | 4632ea22580c31d44b0786321668d9e78f02900e (patch) | |
tree | 38990e5a8d6a6fac511106c0d2b7a12ae01153d5 | |
parent | c8e979b3b800e4c58be454daa0213285d4ee6510 (diff) |
xselinux: Rip out the selection code in advance of polyinstantiation support.
This resolves an issue where BadWindow errors were being thrown.
-rw-r--r-- | Xext/xselinux.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 5aa2ad3fa..60ec8d494 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -951,42 +951,11 @@ static void SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata) { SelectionInfoRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; switch (rec->kind) { case SelectionSetOwner: - /* save off the "real" owner of the selection */ - rec->selection->alt_client = rec->selection->client; - rec->selection->alt_window = rec->selection->window; - - /* figure out the new label for the content */ - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->selection->devPrivates, objectKey); - sidput(obj->sid); - - if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION, - &obj->sid) < 0) { - ErrorF("SELinux: a compute_create call failed!\n"); - obj->sid = unlabeled_sid; - } - break; - case SelectionGetOwner: - /* restore the real owner */ - rec->selection->window = rec->selection->alt_window; - break; - case SelectionConvertSelection: - /* redirect the convert request if necessary */ - if (securityManager && securityManager != rec->client) { - rec->selection->client = securityManager; - rec->selection->window = securityWindow; - } else { - rec->selection->client = rec->selection->alt_client; - rec->selection->window = rec->selection->alt_window; - } - break; default: break; } |