xserver: Branch 'master'

[Eamon Walsh]

 Xext/xselinux.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1393a97ea97b5f7d7b90e3e8c58b5996b600e0c6
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Dec 20 16:23:35 2007 -0500

    xselinux: Send AVC messages to audit system instead of log file/stderr.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index bbae483..bbd8d1a 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -462,8 +462,12 @@ static int
 SELinuxLog(int type, const char *fmt, ...)
 {
     va_list ap;
+    char buf[MAX_AUDIT_MESSAGE_LENGTH];
+    int rc, aut = AUDIT_USER_AVC;
+
     va_start(ap, fmt);
-    VErrorF(fmt, ap);
+    vsnprintf(buf, MAX_AUDIT_MESSAGE_LENGTH, fmt, ap);
+    rc = audit_log_user_avc_message(audit_fd, aut, buf, NULL, NULL, NULL, 0);
     va_end(ap);
     return 0;
 }