[libvirt] [PATCH 5/6] security_selinux: Drop virSecuritySELinuxSetFileconHelper
This function is no longer needed because after previous commits
it's just an alias to virSecuritySELinuxSetFilecon.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/security/security_selinux.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index e7cf5f2e53..855eaafdda 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -226,7 +226,7 @@ virSecuritySELinuxRecallLabel(const char *path,
}
-static int virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr,
+static int virSecuritySELinuxSetFilecon(virSecurityManagerPtr mgr,
const char *path,
const char *tcon,
bool remember);
@@ -281,10 +281,10 @@ virSecuritySELinuxTransactionRun(pid_t pid ATTRIBUTE_UNUSED,
const bool remember = item->remember && list->lock;
if (!item->restore) {
- rv = virSecuritySELinuxSetFileconHelper(list->manager,
- item->path,
- item->tcon,
- remember);
+ rv = virSecuritySELinuxSetFilecon(list->manager,
+ item->path,
+ item->tcon,
+ remember);
} else {
rv = virSecuritySELinuxRestoreFileLabel(list->manager,
item->path,
@@ -1332,10 +1332,10 @@ virSecuritySELinuxSetFileconImpl(const char *path,
static int
-virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr,
- const char *path,
- const char *tcon,
- bool remember)
+virSecuritySELinuxSetFilecon(virSecurityManagerPtr mgr,
+ const char *path,
+ const char *tcon,
+ bool remember)
{
bool privileged = virSecurityManagerGetPrivileged(mgr);
security_context_t econ = NULL;
@@ -1411,15 +1411,6 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr,
}
-static int
-virSecuritySELinuxSetFilecon(virSecurityManagerPtr mgr,
- const char *path,
- const char *tcon,
- bool remember)
-{
- return virSecuritySELinuxSetFileconHelper(mgr, path, tcon, remember);
-}
-
static int
virSecuritySELinuxFSetFilecon(int fd, char *tcon)
{
--
2.21.0