From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Aug 2017 10:46:09 +0000 (+0200)
Subject: mkdir: chmod_and_chown() returns errors as "return -errno", not in errno itself
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c216c41251f648d0fecd5a8e6baa061ad3f1ce36;p=elogind.git

mkdir: chmod_and_chown() returns errors as "return -errno", not in errno itself
---

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index db1e83291..867219e4b 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -34,10 +34,13 @@
 
 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir) {
         struct stat st;
+        int r;
 
-        if (_mkdir(path, mode) >= 0)
-                if (chmod_and_chown(path, mode, uid, gid) < 0)
-                        return -errno;
+        if (_mkdir(path, mode) >= 0) {
+                r = chmod_and_chown(path, mode, uid, gid);
+                if (r < 0)
+                        return r;
+        }
 
         if (lstat(path, &st) < 0)
                 return -errno;