]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't overwrite errors from virConfReadFile
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 4 Dec 2013 15:23:11 +0000 (15:23 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 4 Dec 2013 15:40:23 +0000 (15:40 +0000)
The SELinux security driver would overwrite errors from the
virConfReadFile function.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/security/security_selinux.c

index ace9cc0eadbded9f54ed5562db5afabc374e10ca..11c0c3bd99387276ba0d8cd00737286f525ca570 100644 (file)
@@ -414,13 +414,8 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr)
     }
 # endif
 
-    selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0);
-    if (!selinux_conf) {
-        virReportSystemError(errno,
-                             _("cannot open SELinux lxc contexts file '%s'"),
-                             selinux_lxc_contexts_path());
+    if (!(selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0)))
         goto error;
-    }
 
     scon = virConfGetValue(selinux_conf, "process");
     if (! scon || scon->type != VIR_CONF_STRING || (! scon->str)) {