openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType 

The check is done in virSecuritySELinuxSetFilecon itself. There's
no need to check it again.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-09-10 13:29:36 +02:00
parent d3f6173086
commit 370461d1db
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/security/security_selinux.c
View File

@ -2355,11 +2355,9 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
virSecuritySELinuxSetFilecon(def->os.dtb, data->content_context) < 0) virSecuritySELinuxSetFilecon(def->os.dtb, data->content_context) < 0)
return -1; return -1;
if (stdin_path) { if (stdin_path &&
if (virSecuritySELinuxSetFilecon(stdin_path, data->content_context) < 0 && virSecuritySELinuxSetFilecon(stdin_path, data->content_context) < 0)
virFileIsSharedFSType(stdin_path, VIR_FILE_SHFS_NFS) != 1)
return -1; return -1;
}
return 0; return 0;
} }