frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xselinux: Rip out the selection code in advance of polyinstantiation support. 

This resolves an issue where BadWindow errors were being thrown.
This commit is contained in:
Eamon Walsh 2008-02-26 22:00:52 -05:00 committed by Eamon Walsh
parent c8e979b3b8
commit 4632ea2258
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Xext/xselinux.c
View File

@ -951,42 +951,11 @@ static void
SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata) SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
{ {
SelectionInfoRec *rec = calldata; SelectionInfoRec *rec = calldata;
SELinuxSubjectRec *subj;
SELinuxObjectRec *obj;
switch (rec->kind) { switch (rec->kind) {
case SelectionSetOwner: 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: case SelectionGetOwner:
/* restore the real owner */
rec->selection->window = rec->selection->alt_window;
break;
case SelectionConvertSelection: 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: default:
break; break;
} }