xserver: Branch 'XACE-SELINUX'
Eamon Walsh
ewalsh at kemper.freedesktop.org
Mon Mar 26 19:24:18 EEST 2007
Xext/security.c | 2 +-
Xext/xselinux.c | 12 +++++++-----
dix/property.c | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
New commits:
diff-tree 84a066cc88fe4326ddacd04ab5e1158a80571c33 (from e1cc68add0bcdd5e0e4e15cf6ee8a3da136d3534)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Mar 23 10:33:53 2007 -0400
xace: pass serverClient as default argument to dixChangeWindowProperty
instead of NullClient.
diff --git a/Xext/security.c b/Xext/security.c
index 7ea032f..74ba8d4 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1715,7 +1715,7 @@ SecurityCheckPropertyAccess(CallbackList
/* if client trusted or window untrusted, allow operation */
- if (!client || (TRUSTLEVEL(client) == XSecurityClientTrusted) ||
+ if ((TRUSTLEVEL(client) == XSecurityClientTrusted) ||
(TRUSTLEVEL(wClient(pWin)) != XSecurityClientTrusted) )
return;
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 4ed2784..648bb6e 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1070,7 +1070,7 @@ XSELinuxProperty(CallbackListPtr *pcbl,
char *propname = NameForAtom(rec->pProp->propertyName);
tclient = wClient(pWin);
- if (!client || !tclient || !HAVESTATE(tclient))
+ if (!tclient || !HAVESTATE(tclient))
return;
propsid = GetPropertySID(SID(tclient)->ctx, propname);
@@ -1235,13 +1235,15 @@ XSELinuxResourceState(CallbackListPtr *p
rc = avc_sid_to_context(SID(client), &ctx);
if (rc < 0)
FatalError("XSELinux: Failed to get security context!\n");
- rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
- PropModeReplace, strlen(ctx), ctx, FALSE);
+ rc = dixChangeWindowProperty(serverClient,
+ pWin, atom_client_ctx, XA_STRING, 8,
+ PropModeReplace, strlen(ctx), ctx, FALSE);
freecon(ctx);
}
else
- rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
- PropModeReplace, 10, "UNLABELED!", FALSE);
+ rc = dixChangeWindowProperty(serverClient,
+ pWin, atom_client_ctx, XA_STRING, 8,
+ PropModeReplace, 10, "UNLABELED!", FALSE);
if (rc != Success)
FatalError("XSELinux: Failed to set context property on window!\n");
} /* XSELinuxResourceState */
diff --git a/dix/property.c b/dix/property.c
index 9ff6993..74d548d 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -374,7 +374,7 @@ ChangeWindowProperty(WindowPtr pWin, Ato
int mode, unsigned long len, pointer value,
Bool sendevent)
{
- return dixChangeWindowProperty(NullClient, pWin, property, type, format,
+ return dixChangeWindowProperty(serverClient, pWin, property, type, format,
mode, len, value, sendevent);
}
More information about the xorg-commit
mailing list