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

Remove trailing whitespace (whitespace police).

This commit is contained in:
Eamon Walsh 2006-12-12 13:35:22 -05:00 committed by Eamon Walsh
parent ca77c12107
commit e124806994
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Xext/xselinux.c
View File

@ -135,8 +135,8 @@ static char *XSELinuxRootWindowContext = NULL;
extern Selection *CurrentSelections; extern Selection *CurrentSelections;
extern int NumCurrentSelections; extern int NumCurrentSelections;
/* /*
* list of classes corresponding to SIDs in the * list of classes corresponding to SIDs in the
* rsid array of the security state structure (below). * rsid array of the security state structure (below).
* *
* XXX SIDs should be stored in their native objects, not all * XXX SIDs should be stored in their native objects, not all
@ -193,7 +193,7 @@ IndexByClass(security_class_t class)
} }
/* /*
* Does sanity checking on a resource ID. This can be removed after * Does sanity checking on a resource ID. This can be removed after
* testing. * testing.
*/ */
static void static void
@ -351,7 +351,7 @@ ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
con = context_new(base); con = context_new(base);
if (!con) if (!con)
goto out2; goto out2;
/* look in the mappings of names to types */ /* look in the mappings of names to types */
ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes; ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes;
for (; *ptr; ptr+=2) for (; *ptr; ptr+=2)
@ -564,14 +564,14 @@ CheckSendEventPerms(ClientPtr client)
swapl(&stuff->destination, n); swapl(&stuff->destination, n);
return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm); return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm);
} }
static int static int
CheckConvertSelectionPerms(ClientPtr client) CheckConvertSelectionPerms(ClientPtr client)
{ {
register char n; register char n;
int rval = TRUE; int rval = TRUE;
REQUEST(xConvertSelectionReq); REQUEST(xConvertSelectionReq);
if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq)) if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
return FALSE; return FALSE;
@ -620,11 +620,11 @@ CheckSetSelectionOwnerPerms(ClientPtr client)
rval = rval && IDPerm(client, CurrentSelections[i].window, rval = rval && IDPerm(client, CurrentSelections[i].window,
SECCLASS_WINDOW, WINDOW__CHSELECTION); SECCLASS_WINDOW, WINDOW__CHSELECTION);
} }
rval = rval && IDPerm(client, stuff->window, rval = rval && IDPerm(client, stuff->window,
SECCLASS_WINDOW, WINDOW__CHSELECTION); SECCLASS_WINDOW, WINDOW__CHSELECTION);
return rval; return rval;
} }
CALLBACK(XSELinuxCoreDispatch) CALLBACK(XSELinuxCoreDispatch)
{ {
XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata; XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
@ -678,7 +678,7 @@ CALLBACK(XSELinuxCoreDispatch)
/* Window class control requirements */ /* Window class control requirements */
case X_ChangeProperty: case X_ChangeProperty:
rval = IDPERM(client, xChangePropertyReq, window, rval = IDPERM(client, xChangePropertyReq, window,
SECCLASS_WINDOW, SECCLASS_WINDOW,
WINDOW__CHPROPLIST | WINDOW__CHPROP | WINDOW__CHPROPLIST | WINDOW__CHPROP |
WINDOW__LISTPROP); WINDOW__LISTPROP);
break; break;
@ -914,7 +914,7 @@ CALLBACK(XSELinuxCoreDispatch)
&& IDPERM(client, xPolyTextReq, drawable, && IDPERM(client, xPolyTextReq, drawable,
SECCLASS_DRAWABLE, DRAWABLE__DRAW); SECCLASS_DRAWABLE, DRAWABLE__DRAW);
break; break;
/* Pixmap class control requirements */ /* Pixmap class control requirements */
case X_CreatePixmap: case X_CreatePixmap:
rval = IDPERM(client, xCreatePixmapReq, pid, rval = IDPERM(client, xCreatePixmapReq, pid,
@ -950,7 +950,7 @@ CALLBACK(XSELinuxCoreDispatch)
rval = IDPERM(client, xResourceReq, id, rval = IDPERM(client, xResourceReq, id,
SECCLASS_CURSOR, CURSOR__FREE); SECCLASS_CURSOR, CURSOR__FREE);
break; break;
/* GC class control requirements */ /* GC class control requirements */
case X_CreateGC: case X_CreateGC:
rval = IDPERM(client, xCreateGCReq, gc, rval = IDPERM(client, xCreateGCReq, gc,
@ -1018,7 +1018,7 @@ CALLBACK(XSELinuxExtDispatch)
security_id_t extsid; security_id_t extsid;
access_vector_t perm; access_vector_t perm;
REQUEST(xReq); REQUEST(xReq);
/* XXX there should be a separate callback for this */ /* XXX there should be a separate callback for this */
if (!EXTENSIONSID(ext)) if (!EXTENSIONSID(ext))
{ {
@ -1215,7 +1215,7 @@ CALLBACK(XSELinuxWindowInit)
rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8, rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
PropModeReplace, strlen(ctx), ctx, FALSE); PropModeReplace, strlen(ctx), ctx, FALSE);
freecon(ctx); freecon(ctx);
} }
else else
rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8, rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
PropModeReplace, 10, "UNLABELED!", FALSE); PropModeReplace, 10, "UNLABELED!", FALSE);
@ -1441,7 +1441,7 @@ XSELinuxParsePropertyTypeRule(char *p)
newTypes[propertyTypesCount*2 - 2] = propcopy; newTypes[propertyTypesCount*2 - 2] = propcopy;
newTypes[propertyTypesCount*2 - 1] = typecopy; newTypes[propertyTypesCount*2 - 1] = typecopy;
propertyTypes = newTypes; propertyTypes = newTypes;
return TRUE; return TRUE;
@ -1612,7 +1612,7 @@ XSELinuxLoadConfigFile(void)
int lineNumber = 0; int lineNumber = 0;
char **newTypes; char **newTypes;
Bool ret = FALSE; Bool ret = FALSE;
if (!XSELINUXCONFIGFILE) if (!XSELINUXCONFIGFILE)
return FALSE; return FALSE;
@ -1837,7 +1837,7 @@ XSELinuxExtensionSetup(INITARGS)
{ {
/* Allocate the client private index */ /* Allocate the client private index */
clientPrivateIndex = AllocateClientPrivateIndex(); clientPrivateIndex = AllocateClientPrivateIndex();
if (!AllocateClientPrivate(clientPrivateIndex, if (!AllocateClientPrivate(clientPrivateIndex,
sizeof (XSELinuxClientStateRec))) sizeof (XSELinuxClientStateRec)))
FatalError("XSELinux: Failed to allocate client private.\n"); FatalError("XSELinux: Failed to allocate client private.\n");