From: Eric Blake <eblake@redhat.com>
Date: Sat, 26 Feb 2011 00:28:21 +0000 (-0700)
Subject: audit: tweak audit messages to match conventions
X-Git-Tag: CVE-2011-1146~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ad48836ed79adb91ee2aee5e1d5245e3620842;p=thirdparty%2Flibvirt.git

audit: tweak audit messages to match conventions

* src/qemu/qemu_audit.c (qemuDomainHostdevAudit): Avoid use of
"type", which has a pre-defined meaning.
(qemuDomainCgroupAudit): Likewise, as well as "item".
---

diff --git a/src/qemu/qemu_audit.c b/src/qemu/qemu_audit.c
index b1948c8028..0f954c0c3f 100644
--- a/src/qemu/qemu_audit.c
+++ b/src/qemu/qemu_audit.c
@@ -159,7 +159,7 @@ qemuDomainHostdevAudit(virDomainObjPtr vm,
     }
 
     VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success,
-              "resrc=dev reason=%s %s uuid=%s type=%s %s",
+              "resrc=dev reason=%s %s uuid=%s bus=%s %s",
               reason, vmname, uuidstr,
               virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type),
               device);
@@ -200,14 +200,14 @@ void qemuDomainCgroupAudit(virDomainObjPtr vm,
         return;
     }
     if (name &&
-        !(detail = virAuditEncode(STREQ(item, "path") ? "path" : "type",
+        !(detail = virAuditEncode(STREQ(item, "path") ? "path" : "category",
                                   name))) {
         VIR_WARN0("OOM while encoding audit message");
         goto cleanup;
     }
 
     VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success,
-              "resrc=cgroup reason=%s %s uuid=%s item=%s%s%s",
+              "resrc=cgroup reason=%s %s uuid=%s class=%s%s%s",
               reason, vmname, uuidstr,
               item, detail ? " " : "", detail ? detail : "");