From: Jérémy Rosen <jeremy.rosen@enst-bretagne.fr>
Date: Sun, 17 Jun 2018 13:20:17 +0000 (+0200)
Subject: add _AUDIT_TYPE_NAME field to audit records in the journal
X-Git-Tag: v239~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14c1abccf0e06c155cebb4443f0ec3a1e6dfd1f2;p=thirdparty%2Fsystemd.git

add _AUDIT_TYPE_NAME field to audit records in the journal
---

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 5e56f3cf425..87726684af4 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -321,7 +321,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
         char id_field[sizeof("_AUDIT_ID=") + DECIMAL_STR_MAX(uint64_t)],
              type_field[sizeof("_AUDIT_TYPE=") + DECIMAL_STR_MAX(int)],
              source_time_field[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)];
-        char *m;
+        char *m, *type_field_name;
         int k;
 
         assert(s);
@@ -354,7 +354,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
         if (isempty(p))
                 return;
 
-        n_iov_allocated = N_IOVEC_META_FIELDS + 7;
+        n_iov_allocated = N_IOVEC_META_FIELDS + 8;
         iov = new(struct iovec, n_iov_allocated);
         if (!iov) {
                 log_oom();
@@ -379,6 +379,9 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
 
         type_name = audit_type_name_alloca(type);
 
+        type_field_name = strjoina("_AUDIT_TYPE_NAME=", type_name);
+        iov[n_iov++] = IOVEC_MAKE_STRING(type_field_name);
+
         m = strjoina("MESSAGE=", type_name, " ", p);
         iov[n_iov++] = IOVEC_MAKE_STRING(m);