]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "Fixes #11128"
authorTaro Yamada <archer_ame@yahoo.co.jp>
Sun, 27 Jan 2019 04:43:30 +0000 (13:43 +0900)
committerTaro Yamada <archer_ame@yahoo.co.jp>
Sun, 27 Jan 2019 04:43:30 +0000 (13:43 +0900)
This reverts commit 0bf05f0122f0f13cd0c0bc35a31861875d2ead31 because it breaks 30c81ce.
Please see #11540.

src/core/execute.c

index 092c80a6e7c87561b99a625f6c28489698900dc5..07c5a72721b58da24edb3dc6a89b9c370d96032c 100644 (file)
@@ -2160,14 +2160,8 @@ static int setup_exec_directory(
                         r = mkdir_label(p, context->directories[type].mode);
                         if (r < 0 && r != -EEXIST)
                                 goto fail;
-                        if (r == -EEXIST) {
-                                if (chmod(p, context->directories[type].mode) < 0) {
-                                        r = -errno;
-                                        goto fail;
-                                }
-                                if (!context->dynamic_user)
-                                        continue;
-                        }
+                        if (r == -EEXIST && !context->dynamic_user)
+                                continue;
                 }
 
                 /* Don't change the owner of the configuration directory, as in the common case it is not written to by