From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 16 Jul 2020 08:45:22 +0000 (+0100)
Subject: basic/mkdir: use uid_is_valid instead of manual check
X-Git-Tag: v246-rc2~56^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc76bf01e38f354bc60adc747af83b4ae006a6b7;p=thirdparty%2Fsystemd.git

basic/mkdir: use uid_is_valid instead of manual check
---

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index ed5c4546e40..6ebc2b95fd1 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -136,7 +136,7 @@ int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, ui
                 if (prefix && path_startswith(prefix, t))
                         continue;
 
-                if (uid == UID_INVALID && gid == UID_INVALID && flags == 0) {
+                if (!uid_is_valid(uid) && !gid_is_valid(gid) && flags == 0) {
                         r = _mkdir(t, mode);
                         if (r < 0 && r != -EEXIST)
                                 return r;
@@ -167,7 +167,7 @@ int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, uid_t ui
         if (r < 0)
                 return r;
 
-        if (uid == UID_INVALID && gid == UID_INVALID && flags == 0) {
+        if (!uid_is_valid(uid) && !gid_is_valid(gid) && flags == 0) {
                 r = _mkdir(path, mode);
                 if (r < 0 && (r != -EEXIST || is_dir(path, true) <= 0))
                         return r;