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.

4 files changed, 13 insertions, 12 deletions

diff --git a/src/shared/label.c b/src/shared/label.c
index fe7fd8381e..eae6614969 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -32,7 +32,7 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         }
 
         if (mac_smack_use()) {
-                r = mac_smack_relabel_in_dev(path);
+                r = mac_smack_fix(path);
                 if (r < 0)
                         return r;
         }
diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
index 2b9cb161cb..48941b3df4 100644
--- a/src/shared/mkdir-label.c
+++ b/src/shared/mkdir-label.c
@@ -46,7 +46,7 @@ static int label_mkdir(const char *path, mode_t mode) {
                 if (r < 0 && errno != EEXIST)
                         return -errno;
 
-                r = mac_smack_relabel_in_dev(path);
+                r = mac_smack_fix(path);
                 if (r < 0)
                         return r;
         }
diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 0bedd75081..7726d69b0f 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
diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h
index 50cb79a728..fe624f5f46 100644
--- a/src/shared/smack-util.h
+++ b/src/shared/smack-util.h
@@ -30,8 +30,9 @@
 
 bool mac_smack_use(void);
 
-int mac_smack_set_path(const char *path, const char *label);
-int mac_smack_set_fd(int fd, const char *label);
-int mac_smack_set_ip_in_fd(int fd, const char *label);
-int mac_smack_set_ip_out_fd(int fd, const char *label);
-int mac_smack_relabel_in_dev(const char *path);
+int mac_smack_fix(const char *path);
+
+int mac_smack_apply(const char *path, const char *label);
+int mac_smack_apply_fd(int fd, const char *label);
+int mac_smack_apply_ip_in_fd(int fd, const char *label);
+int mac_smack_apply_ip_out_fd(int fd, const char *label);