summaryrefslogtreecommitdiff
path: root/src/shared/smack-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-23 17:49:29 +0200
committerAnthony G. Basile <blueness@gentoo.org>2014-10-25 18:31:53 -0400
commit00772eaeba4662181fc86fa842ff8521ccade88a (patch)
tree43de1accc33d656e0542ae56c1f1fd66d3e991b4 /src/shared/smack-util.c
parent575644587b1c0bd56301552955122d4d6adacaf7 (diff)
mac: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all that reset it to defaults mac_{selinux|smack}_fix()
Let's clean up the naming schemes a bit and use the same one for SMACK and for SELINUX. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/shared/smack-util.c')
-rw-r--r--src/shared/smack-util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 0fb2c9db94..e06feb42c3 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -41,7 +41,7 @@ bool mac_smack_use(void) {
}
-int mac_smack_set_path(const char *path, const char *label) {
+int mac_smack_apply(const char *path, const char *label) {
#ifdef HAVE_SMACK
if (!mac_smack_use())
return 0;
@@ -55,7 +55,7 @@ int mac_smack_set_path(const char *path, const char *label) {
#endif
}
-int mac_smack_set_fd(int fd, const char *label) {
+int mac_smack_apply_fd(int fd, const char *label) {
#ifdef HAVE_SMACK
if (!mac_smack_use())
return 0;
@@ -66,7 +66,7 @@ int mac_smack_set_fd(int fd, const char *label) {
#endif
}
-int mac_smack_set_ip_out_fd(int fd, const char *label) {
+int mac_smack_apply_ip_out_fd(int fd, const char *label) {
#ifdef HAVE_SMACK
if (!mac_smack_use())
return 0;
@@ -77,7 +77,7 @@ int mac_smack_set_ip_out_fd(int fd, const char *label) {
#endif
}
-int mac_smack_set_ip_in_fd(int fd, const char *label) {
+int mac_smack_apply_ip_in_fd(int fd, const char *label) {
#ifdef HAVE_SMACK
if (!mac_smack_use())
return 0;
@@ -88,7 +88,7 @@ int mac_smack_set_ip_in_fd(int fd, const char *label) {
#endif
}
-int mac_smack_relabel_in_dev(const char *path) {
+int mac_smack_fix(const char *path) {
int r = 0;
#ifdef HAVE_SMACK