X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Flabel.c;h=d353da57ec3d2779d2de7a77388ae7193426aae3;hp=7aa362106e39871077a6d1e6c47d27e41bd2bf17;hb=f274ece0f76b5709408821e317e87aef76123db6;hpb=c9bc07646100855ff8193e1e62c52b77327e264d

diff --git a/src/shared/label.c b/src/shared/label.c
index 7aa362106..d353da57e 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -31,25 +31,12 @@
 #include "path-util.h"
 
 #ifdef HAVE_SELINUX
+#include "selinux-util.h"
 #include <selinux/selinux.h>
 #include <selinux/label.h>
 
 static struct selabel_handle *label_hnd = NULL;
 
-static int use_selinux_cached = -1;
-
-static inline bool use_selinux(void) {
-
-        if (use_selinux_cached < 0)
-                use_selinux_cached = is_selinux_enabled() > 0;
-
-        return use_selinux_cached;
-}
-
-void label_retest_selinux(void) {
-        use_selinux_cached = -1;
-}
-
 #endif
 
 int label_init(const char *prefix) {
@@ -199,7 +186,7 @@ int label_context_set(const char *path, mode_t mode) {
                 return 0;
 
         r = selabel_lookup_raw(label_hnd, &filecon, path, mode);
-        if (r < 0)
+        if (r < 0 && errno != ENOENT)
                 r = -errno;
         else if (r == 0) {
                 r = setfscreatecon(filecon);