[libvirt] [PATCH] Don't overwrite errors from virConfReadFile
Daniel P. Berrange
berrange at redhat.com
Wed Dec 4 15:24:16 UTC 2013
From: "Daniel P. Berrange" <berrange at redhat.com>
The SELinux security driver would overwrite errors from the
virConfReadFile function.
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
src/security/security_selinux.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index ace9cc0..11c0c3b 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -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)) {
--
1.8.3.1
More information about the libvir-list
mailing list