From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 14 Oct 2013 12:04:50 +0000 (+0100)
Subject: Ensure lxcContainerMain reports errors on stderr
X-Git-Tag: CVE-2013-4401~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=558546fb8f7104ad7fbdd14c615404618ce91453;p=thirdparty%2Flibvirt.git

Ensure lxcContainerMain reports errors on stderr

Ensure the lxcContainerMain method reports any errors that
occur during setup to stderr, where libvirtd will pick them
up.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 7c722ccdc9..9e87175073 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1905,6 +1905,15 @@ cleanup:
         ret = virCommandExec(cmd);
     }
 
+    if (ret != 0) {
+        virErrorPtr err = virGetLastError();
+        if (err && err->message)
+            fprintf(stderr, "%s\n", err->message);
+        else
+            fprintf(stderr, "%s\n",
+                    _("Unknown failure in libvirt_lxc startup"));
+    }
+
     virCommandFree(cmd);
     return ret;
 }