xserver: Branch 'master' - 2 commits

[Eamon Walsh]

 Xext/xselinux.c |   14 +++++++++++++-
 dix/events.c    |    5 ++---
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 2809a56b4bc7f09f132c70dc39c6695495351c4d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Oct 30 16:05:40 2008 -0400

    xace: Fix an incorrect call to the RECEIVE_ACCESS hook.

diff --git a/dix/events.c b/dix/events.c
index 658dbc3..952a801 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3710,7 +3710,7 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
                         if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
                                      grab->window, &core, 1) ||
                                 XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                                         grab->window, &count, 1))
+                                         grab->window, &core, 1))
                             deliveries = 1; /* don't send, but pretend we did */
                         else if (!IsInterferingGrab(rClient(grab), thisDev,
                                     &core))
@@ -3736,8 +3736,7 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
                     if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
                                  grab->window, xE, count) ||
                             XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                                     grab->window,
-                                xE, count))
+                                     grab->window, xE, count))
                         deliveries = 1; /* don't send, but pretend we did */
                     else
                     {
commit 0f2fd0577fe2740a32d3a2749e2c3582f891417c
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Oct 30 15:35:33 2008 -0400

    xselinux: send more specific message types to libaudit.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 60fd23c..945984d 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -657,7 +657,19 @@ SELinuxLog(int type, const char *fmt, ...)
 {
     va_list ap;
     char buf[MAX_AUDIT_MESSAGE_LENGTH];
-    int rc, aut = AUDIT_USER_AVC;
+    int rc, aut;
+
+    switch (type) {
+    case SELINUX_INFO:
+	aut = AUDIT_USER_MAC_POLICY_LOAD;
+	break;
+    case SELINUX_AVC:
+	aut = AUDIT_USER_AVC;
+	break;
+    default:
+	aut = AUDIT_USER_SELINUX_ERR;
+	break;
+    }
 
     va_start(ap, fmt);
     vsnprintf(buf, MAX_AUDIT_MESSAGE_LENGTH, fmt, ap);