From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Oct 2014 15:49:29 +0000 (+0200)
Subject: mac: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all... 
X-Git-Tag: v217~106
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c80d766c8072dd0be311dcd31c17f9719775be44

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.
---

diff --git a/src/core/socket.c b/src/core/socket.c
index fce1695f0..abe829ade 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -921,12 +921,12 @@ static void socket_apply_socket_options(Socket *s, int fd) {
         }
 
         if (s->smack_ip_in)
-                if (mac_smack_set_ip_in_fd(fd, s->smack_ip_in) < 0)
-                        log_error_unit(UNIT(s)->id, "mac_smack_set_ip_in_fd: %m");
+                if (mac_smack_apply_ip_in_fd(fd, s->smack_ip_in) < 0)
+                        log_error_unit(UNIT(s)->id, "mac_smack_apply_ip_in_fd: %m");
 
         if (s->smack_ip_out)
-                if (mac_smack_set_ip_out_fd(fd, s->smack_ip_out) < 0)
-                        log_error_unit(UNIT(s)->id, "mac_smack_set_ip_out_fd: %m");
+                if (mac_smack_apply_ip_out_fd(fd, s->smack_ip_out) < 0)
+                        log_error_unit(UNIT(s)->id, "mac_smack_apply_ip_out_fd: %m");
 }
 
 static void socket_apply_fifo_options(Socket *s, int fd) {
@@ -939,8 +939,8 @@ static void socket_apply_fifo_options(Socket *s, int fd) {
                                          "F_SETPIPE_SZ: %m");
 
         if (s->smack)
-                if (mac_smack_set_fd(fd, s->smack) < 0)
-                        log_error_unit(UNIT(s)->id, "mac_smack_set_fd: %m");
+                if (mac_smack_apply_fd(fd, s->smack) < 0)
+                        log_error_unit(UNIT(s)->id, "mac_smack_apply_fd: %m");
 }
 
 static int fifo_address_create(
diff --git a/src/shared/label.c b/src/shared/label.c
index fe7fd8381..eae661496 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 2b9cb161c..48941b3df 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 0bedd7508..7726d69b0 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 50cb79a72..fe624f5f4 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);
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 3982ef921..803d80327 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -307,7 +307,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
 
                         } else if (streq(name, "smack")) {
                                 smack = true;
-                                if (mac_smack_set_path(devnode, label) < 0)
+                                if (mac_smack_apply(devnode, label) < 0)
                                         log_error("SECLABEL: failed to set SMACK label '%s'", label);
                                 else
                                         log_debug("SECLABEL: set SMACK label '%s'", label);
@@ -320,7 +320,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
                 if (!selinux)
                         label_fix(devnode, true, false);
                 if (!smack)
-                        mac_smack_set_path(devnode, NULL);
+                        mac_smack_apply(devnode, NULL);
         }
 
         /* always update timestamp when we re-use the node, like on media change events */