Attachment 641091 Details for Bug 872653 – oops wrong patch

[patch] oops wrong patch

libvirt-lxc-audit.patch (text/plain), 2.17 KB, created by Daniel Walsh on 2012-11-08 22:04:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Walsh

Created: 2012-11-08 22:04:09 UTC

Size: 2.17 KB

patch

obsolete

>diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
>index fb878d4..022b98f 100644
>--- a/src/lxc/lxc_controller.c
>+++ b/src/lxc/lxc_controller.c
>@@ -60,6 +60,7 @@
> #include "lxc_container.h"
> #include "lxc_cgroup.h"
> #include "lxc_protocol.h"
>+#include "viraudit.h"
> #include "virnetdev.h"
> #include "virnetdevveth.h"
> #include "memory.h"
>@@ -1362,6 +1363,8 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
>     char **containerTTYPaths = NULL;
>     size_t i;
>     char *initpidfile = NULL;
>+    char uuidstr[VIR_UUID_STRING_BUFLEN];
>+    virUUIDFormat(ctrl->def->uuid, uuidstr);
> 
>     if (VIR_ALLOC_N(containerTTYPaths, ctrl->nconsoles) < 0) {
>         virReportOOMError();
>@@ -1402,8 +1405,18 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
>                                            control[1],
>                                            containerhandshake[1],
>                                            containerTTYPaths,
>-                                           ctrl->nconsoles)) < 0)
>+                                           ctrl->nconsoles)) < 0) {
>+
>+        VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, FALSE,
>+                  "lxc=%s op=start reason=booted uuid=%s",
>+                  ctrl->name, uuidstr);
>+
>         goto cleanup;
>+    }
>+
>+    VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, TRUE,
>+              "lxc=%s op=start reason=booted uuid=%s init-pid=%lld",
>+              ctrl->name, uuidstr, (long long)ctrl->initpid);
> 
>     if (virAsprintf(&initpidfile, "%s_init", ctrl->name) < 0) {
>         virReportOOMError();
>@@ -1469,6 +1482,11 @@ cleanup:
>     virLXCControllerStopInit(ctrl);
> 
>     if (initpidfile) {
>+
>+        VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, TRUE,
>+                  "lxc=%s op=start reason=%s uuid=%s init-pid=%lld",
>+                  ctrl->name, (rc ? "Crashed": "shutdown"), uuidstr, (long long)ctrl->initpid);
>+
>         virPidFileDelete(LXC_STATE_DIR, initpidfile);
>         VIR_FREE(initpidfile);
>     }
>@@ -1512,6 +1530,10 @@ int main(int argc, char *argv[])
>     /* Initialize logging */
>     virLogSetFromEnv();
> 
>+    if (virAuditOpen() < 0) {
>+        VIR_DEBUG("Proceeding without auditing");
>+    }
>+
>     while (1) {
>         int c;
>

Actions: View | Diff

Attachments on bug 872653: 640177 | 641091