提交 d75d8b46 编写于 作者: D Daniel P. Berrange

Don't overwrite errors from virConfReadFile

The SELinux security driver would overwrite errors from the
virConfReadFile function.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 78839da0
...@@ -414,13 +414,8 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) ...@@ -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)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册