mac: rename apis with mac_{selinux/smack}_ prefix

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

7 files changed, 47 insertions, 47 deletions

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 8199a26f73..10f74f0ccb 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -36,14 +36,14 @@ static int symlink_and_label(const char *old_path, const char *new_path) {
         assert(old_path);
         assert(new_path);
 
-        r = label_context_set(new_path, S_IFLNK);
+        r = mac_selinux_context_set(new_path, S_IFLNK);
         if (r < 0)
                 return r;
 
         if (symlink(old_path, new_path) < 0)
                 r = -errno;
 
-        label_context_clear();
+        mac_selinux_context_clear();
 
         return r;
 }
diff --git a/src/shared/label.c b/src/shared/label.c
index a129ea97a4..4b0960b96c 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -24,13 +24,13 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r = 0;
 
         if (use_selinux()) {
-                r = label_fix_selinux(path, ignore_enoent, ignore_erofs);
+                r = mac_selinux_fix(path, ignore_enoent, ignore_erofs);
                 if (r < 0)
                         return r;
         }
 
         if (use_smack()) {
-                r = smack_relabel_in_dev(path);
+                r = mac_smack_relabel_in_dev(path);
                 if (r < 0)
                         return r;
         }
diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
index 2fdcae4127..965ef7939f 100644
--- a/src/shared/mkdir-label.c
+++ b/src/shared/mkdir-label.c
@@ -34,7 +34,7 @@ static int label_mkdir(const char *path, mode_t mode) {
         int r;
 
         if (use_selinux()) {
-                r = label_mkdir_selinux(path, mode);
+                r = mac_selinux_mkdir(path, mode);
                 if (r < 0)
                         return r;
         }
@@ -44,7 +44,7 @@ static int label_mkdir(const char *path, mode_t mode) {
                 if (r < 0 && errno != EEXIST)
                         return -errno;
 
-                r = smack_relabel_in_dev(path);
+                r = mac_smack_relabel_in_dev(path);
                 if (r < 0)
                         return r;
         }
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index dd35b05e27..1860eeafa6 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -59,7 +59,7 @@ void retest_selinux(void) {
 #endif
 }
 
-int label_init(const char *prefix) {
+int mac_selinux_init(const char *prefix) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
@@ -106,7 +106,7 @@ int label_init(const char *prefix) {
         return r;
 }
 
-int label_fix_selinux(const char *path, bool ignore_enoent, bool ignore_erofs) {
+int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
@@ -151,7 +151,7 @@ int label_fix_selinux(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return r;
 }
 
-void label_finish(void) {
+void mac_selinux_finish(void) {
 
 #ifdef HAVE_SELINUX
         if (!use_selinux())
@@ -162,7 +162,7 @@ void label_finish(void) {
 #endif
 }
 
-int label_get_create_label_from_exe(const char *exe, char **label) {
+int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {
 
         int r = 0;
 
@@ -199,7 +199,7 @@ fail:
         return r;
 }
 
-int label_get_our_label(char **label) {
+int mac_selinux_get_our_label(char **label) {
         int r = -EOPNOTSUPP;
 
 #ifdef HAVE_SELINUX
@@ -215,7 +215,7 @@ int label_get_our_label(char **label) {
         return r;
 }
 
-int label_get_child_mls_label(int socket_fd, const char *exe, char **label) {
+int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, char **label) {
         int r = -EOPNOTSUPP;
 
 #ifdef HAVE_SELINUX
@@ -307,7 +307,7 @@ out:
         return r;
 }
 
-int label_context_set(const char *path, mode_t mode) {
+int mac_selinux_context_set(const char *path, mode_t mode) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
@@ -336,7 +336,7 @@ int label_context_set(const char *path, mode_t mode) {
         return r;
 }
 
-int label_socket_set(const char *label) {
+int mac_selinux_socket_set(const char *label) {
 
 #ifdef HAVE_SELINUX
         if (!use_selinux())
@@ -354,7 +354,7 @@ int label_socket_set(const char *label) {
         return 0;
 }
 
-void label_context_clear(void) {
+void mac_selinux_context_clear(void) {
 
 #ifdef HAVE_SELINUX
         PROTECT_ERRNO;
@@ -366,7 +366,7 @@ void label_context_clear(void) {
 #endif
 }
 
-void label_socket_clear(void) {
+void mac_selinux_socket_clear(void) {
 
 #ifdef HAVE_SELINUX
         PROTECT_ERRNO;
@@ -378,7 +378,7 @@ void label_socket_clear(void) {
 #endif
 }
 
-void label_free(const char *label) {
+void mac_selinux_free(const char *label) {
 
 #ifdef HAVE_SELINUX
         if (!use_selinux())
@@ -388,7 +388,7 @@ void label_free(const char *label) {
 #endif
 }
 
-int label_mkdir_selinux(const char *path, mode_t mode) {
+int mac_selinux_mkdir(const char *path, mode_t mode) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
@@ -434,7 +434,7 @@ finish:
         return r;
 }
 
-int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
+int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
 
         /* Binds a socket and label its file system object according to the SELinux policy */
 
@@ -505,7 +505,7 @@ skipped:
         return bind(fd, addr, addrlen) < 0 ? -errno : 0;
 }
 
-int label_apply(const char *path, const char *label) {
+int mac_selinux_apply(const char *path, const char *label) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h
index 8a52b6840c..e6637f3fe5 100644
--- a/src/shared/selinux-util.h
+++ b/src/shared/selinux-util.h
@@ -26,27 +26,27 @@
 bool use_selinux(void);
 void retest_selinux(void);
 
-int label_init(const char *prefix);
-int label_fix_selinux(const char *path, bool ignore_enoent, bool ignore_erofs);
-void label_finish(void);
+int mac_selinux_init(const char *prefix);
+int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
+void mac_selinux_finish(void);
 
-int label_socket_set(const char *label);
-void label_socket_clear(void);
+int mac_selinux_socket_set(const char *label);
+void mac_selinux_socket_clear(void);
 
-int label_context_set(const char *path, mode_t mode);
-void label_context_clear(void);
+int mac_selinux_context_set(const char *path, mode_t mode);
+void mac_selinux_context_clear(void);
 
-void label_free(const char *label);
-int label_mkdir_selinux(const char *path, mode_t mode);
+void mac_selinux_free(const char *label);
+int mac_selinux_mkdir(const char *path, mode_t mode);
 
-int label_get_create_label_from_exe(const char *exe, char **label);
-int label_get_our_label(char **label);
-int label_get_child_mls_label(int socket_fd, const char *exec, char **label);
+int mac_selinux_get_create_label_from_exe(const char *exe, char **label);
+int mac_selinux_get_our_label(char **label);
+int mac_selinux_get_child_mls_label(int socket_fd, const char *exec, char **label);
 
-int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen);
+int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen);
 
-int label_apply(const char *path, const char *label);
+int mac_selinux_apply(const char *path, const char *label);
 
-int label_write_one_line_file_atomic(const char *fn, const char *line);
-int label_write_env_file(const char *fname, char **l);
-int label_fopen_temporary(const char *path, FILE **_f, char **_temp_path);
+int mac_selinux_write_one_line_file_atomic(const char *fn, const char *line);
+int mac_selinux_write_env_file(const char *fname, char **l);
+int mac_selinux_label_fopen_temporary(const char *path, FILE **_f, char **_temp_path);
diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 598e5b622d..1b9c7ec93d 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -41,7 +41,7 @@ bool use_smack(void) {
 
 }
 
-int smack_label_path(const char *path, const char *label) {
+int mac_smack_set_path(const char *path, const char *label) {
 #ifdef HAVE_SMACK
         if (!use_smack())
                 return 0;
@@ -55,7 +55,7 @@ int smack_label_path(const char *path, const char *label) {
 #endif
 }
 
-int smack_label_fd(int fd, const char *label) {
+int mac_smack_set_fd(int fd, const char *label) {
 #ifdef HAVE_SMACK
         if (!use_smack())
                 return 0;
@@ -66,7 +66,7 @@ int smack_label_fd(int fd, const char *label) {
 #endif
 }
 
-int smack_label_ip_out_fd(int fd, const char *label) {
+int mac_smack_set_ip_out_fd(int fd, const char *label) {
 #ifdef HAVE_SMACK
         if (!use_smack())
                 return 0;
@@ -77,7 +77,7 @@ int smack_label_ip_out_fd(int fd, const char *label) {
 #endif
 }
 
-int smack_label_ip_in_fd(int fd, const char *label) {
+int mac_smack_set_ip_in_fd(int fd, const char *label) {
 #ifdef HAVE_SMACK
         if (!use_smack())
                 return 0;
@@ -88,7 +88,7 @@ int smack_label_ip_in_fd(int fd, const char *label) {
 #endif
 }
 
-int smack_relabel_in_dev(const char *path) {
+int mac_smack_relabel_in_dev(const char *path) {
         int r = 0;
 
 #ifdef HAVE_SMACK
diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h
index 5b3d9a27a7..0ccb1fb87c 100644
--- a/src/shared/smack-util.h
+++ b/src/shared/smack-util.h
@@ -28,8 +28,8 @@
 
 bool use_smack(void);
 
-int smack_label_path(const char *path, const char *label);
-int smack_label_fd(int fd, const char *label);
-int smack_label_ip_in_fd(int fd, const char *label);
-int smack_label_ip_out_fd(int fd, const char *label);
-int smack_relabel_in_dev(const char *path);
+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);