daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 5e565da856cf4cf919ed1045b01ab461c586395a Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
803fb7
Date: Wed, 4 Mar 2015 10:31:42 -0500
803fb7
Subject: [PATCH] journald: add syslog fields for audit messages
803fb7
803fb7
Audit messages would be displayed as "unknown[1]".
803fb7
803fb7
Also specify AUTH as facility... This seems to be the closest match
803fb7
(/* security/authorization messages */).
803fb7
803fb7
(cherry picked from commit cd556b6ca8aec8dd371806afedec45f852f8f724)
803fb7
---
803fb7
 src/journal/journald-audit.c | 6 +++++-
803fb7
 1 file changed, 5 insertions(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
803fb7
index 151097a6e..77abe2e63 100644
803fb7
--- a/src/journal/journald-audit.c
803fb7
+++ b/src/journal/journald-audit.c
803fb7
@@ -373,7 +373,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
803fb7
         if (isempty(p))
803fb7
                 return;
803fb7
 
803fb7
-        n_iov_allocated = N_IOVEC_META_FIELDS + 5;
803fb7
+        n_iov_allocated = N_IOVEC_META_FIELDS + 7;
803fb7
         iov = new(struct iovec, n_iov_allocated);
803fb7
         if (!iov) {
803fb7
                 log_oom();
803fb7
@@ -392,6 +392,10 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
803fb7
         sprintf(id_field, "_AUDIT_ID=%" PRIu64, id);
803fb7
         IOVEC_SET_STRING(iov[n_iov++], id_field);
803fb7
 
803fb7
+        assert_cc(32 == LOG_AUTH);
803fb7
+        IOVEC_SET_STRING(iov[n_iov++], "SYSLOG_FACILITY=32");
803fb7
+        IOVEC_SET_STRING(iov[n_iov++], "SYSLOG_IDENTIFIER=audit");
803fb7
+
803fb7
         m = alloca(strlen("MESSAGE=<audit-") + DECIMAL_STR_MAX(int) + strlen("> ") + strlen(p) + 1);
803fb7
         sprintf(m, "MESSAGE=<audit-%i> %s", type, p);
803fb7
         IOVEC_SET_STRING(iov[n_iov++], m);