From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Oct 2014 17:41:56 +0000 (+0200)
Subject: label: don't try to create labelled directories more than once
X-Git-Tag: v217~97
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f3c80515c191b4447a2b0bc5a582dbffeca4679f

label: don't try to create labelled directories more than once
---

diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
index 81bc78c1e..8b3538670 100644
--- a/src/shared/mkdir-label.c
+++ b/src/shared/mkdir-label.c
@@ -35,24 +35,19 @@
 static int label_mkdir(const char *path, mode_t mode) {
         int r;
 
-        if (mac_selinux_use()) {
-                r = mac_selinux_mkdir(path, mode);
-                if (r < 0)
-                        return r;
-        }
+        if (mac_selinux_use())
+                return mac_selinux_mkdir(path, mode);
 
         if (mac_smack_use()) {
                 r = mkdir(path, mode);
-                if (r < 0 && errno != EEXIST)
+                if (r < 0)
                         return -errno;
 
-                r = mac_smack_fix(path, false, false);
-                if (r < 0)
-                        return r;
+                return mac_smack_fix(path, false, false);
         }
 
         r = mkdir(path, mode);
-        if (r < 0 && errno != EEXIST)
+        if (r < 0)
                 return -errno;
 
         return 0;