External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't overwrite errors from virConfReadFile

Browse Source 
The SELinux security driver would overwrite errors from the
virConfReadFile function.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-12-04 15:23:11 +00:00
parent 78839da0bb
commit d75d8b46f8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/security/security_selinux.c
View File

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