External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

security_selinux: Drop virSecuritySELinuxSetFileconOptional()

Browse Source 
There is no real difference between
virSecuritySELinuxSetFilecon() and
virSecuritySELinuxSetFileconOptional(). Drop the latter in favour
of the former.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2019-08-22 10:14:05 +02:00
parent 34712a5e3b
commit 079c1d6a29
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/security/security_selinux.c
View File

@ -1419,15 +1419,6 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr,
}
static int
virSecuritySELinuxSetFileconOptional(virSecurityManagerPtr mgr,
const char *path,
const char *tcon,
bool remember)
{
return virSecuritySELinuxSetFileconHelper(mgr, path, tcon, true, remember);
}
static int
virSecuritySELinuxSetFilecon(virSecurityManagerPtr mgr,
const char *path,
@ -1884,28 +1875,28 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
parent_seclabel->label, remember);
} else if (!parent || parent == src) {
if (src->shared) {
ret = virSecuritySELinuxSetFileconOptional(mgr,
src->path,
data->file_context,
remember);
ret = virSecuritySELinuxSetFilecon(mgr,
src->path,
data->file_context,
remember);
} else if (src->readonly) {
ret = virSecuritySELinuxSetFileconOptional(mgr,
src->path,
data->content_context,
remember);
ret = virSecuritySELinuxSetFilecon(mgr,
src->path,
data->content_context,
remember);
} else if (secdef->imagelabel) {
ret = virSecuritySELinuxSetFileconOptional(mgr,
src->path,
secdef->imagelabel,
remember);
ret = virSecuritySELinuxSetFilecon(mgr,
src->path,
secdef->imagelabel,
remember);
} else {
ret = 0;
}
} else {
ret = virSecuritySELinuxSetFileconOptional(mgr,
src->path,
data->content_context,
remember);
ret = virSecuritySELinuxSetFilecon(mgr,
src->path,
data->content_context,
remember);
}
if (ret == 1 && !disk_seclabel) {
@ -2045,14 +2036,14 @@ virSecuritySELinuxSetSCSILabel(virSCSIDevicePtr dev,
return 0;
if (virSCSIDeviceGetShareable(dev))
return virSecuritySELinuxSetFileconOptional(mgr, file,
data->file_context, true);
return virSecuritySELinuxSetFilecon(mgr, file,
data->file_context, true);
else if (virSCSIDeviceGetReadonly(dev))
return virSecuritySELinuxSetFileconOptional(mgr, file,
data->content_context, true);
return virSecuritySELinuxSetFilecon(mgr, file,
data->content_context, true);
else
return virSecuritySELinuxSetFileconOptional(mgr, file,
secdef->imagelabel, true);
return virSecuritySELinuxSetFilecon(mgr, file,
secdef->imagelabel, true);
}
static int