X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsmack-util.c;h=7726d69b0fce607035ee8365d34c9c0e8fd1ca3c;hb=c80d766c8072dd0be311dcd31c17f9719775be44;hp=33e1cd849ec38677e9a1e2e18d911fe97a8e38b7;hpb=cc56fafeebf814ef035e549115cf1850e6473fa5;p=elogind.git

diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 33e1cd849..7726d69b0 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -27,23 +27,23 @@
 #include "path-util.h"
 #include "smack-util.h"
 
-bool use_smack(void) {
+bool mac_smack_use(void) {
 #ifdef HAVE_SMACK
-        static int use_smack_cached = -1;
+        static int cached_use = -1;
 
-        if (use_smack_cached < 0)
-                use_smack_cached = access("/sys/fs/smackfs/", F_OK) >= 0;
+        if (cached_use < 0)
+                cached_use = access("/sys/fs/smackfs/", F_OK) >= 0;
 
-        return use_smack_cached;
+        return cached_use;
 #else
         return false;
 #endif
 
 }
 
-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 (!use_smack())
+        if (!mac_smack_use())
                 return 0;
 
         if (label)
@@ -55,9 +55,9 @@ 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 (!use_smack())
+        if (!mac_smack_use())
                 return 0;
 
         return fsetxattr(fd, "security.SMACK64", label, strlen(label), 0);
@@ -66,9 +66,9 @@ 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 (!use_smack())
+        if (!mac_smack_use())
                 return 0;
 
         return fsetxattr(fd, "security.SMACK64IPOUT", label, strlen(label), 0);
@@ -77,9 +77,9 @@ 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 (!use_smack())
+        if (!mac_smack_use())
                 return 0;
 
         return fsetxattr(fd, "security.SMACK64IPIN", label, strlen(label), 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