chiark / gitweb /
mac: also rename use_{smack,selinux,apparmor}() calls so that they share the new...
[elogind.git] / src / shared / dev-setup.c
index e025e17bbeb014b341694be34af246e930ac0655..96934a9fadfb96560db26f9c4226abf40f3bcdc0 100644 (file)
@@ -38,14 +38,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;
 }
@@ -64,7 +64,7 @@ int dev_setup(const char *prefix) {
                 if (j[0] == '-') {
                         j++;
 
-                        if (access(j, F_OK))
+                        if (access(j, F_OK) < 0)
                                 continue;
                 }