From: Dan Streetman <ddstreet@canonical.com>
Date: Sun, 29 Sep 2019 21:16:55 +0000 (-0400)
Subject: src/core/automount: use DirectoryMode when calling mkdir -p
X-Git-Tag: v244-rc1~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8084dcb9d759e93669127f200bf5ca755432b96e;p=thirdparty%2Fsystemd.git

src/core/automount: use DirectoryMode when calling mkdir -p

mkdir -p is called both when setting up the autofs mount, as well
as after being notified that the real mount unit should be called.
However the first mkdir -p is hardcoded with 0555, while the second
uses the value specified to DirectoryMode in the automount unit; the
second mkdir -p is only needed when called from coldplug, so under
normal operation the dirs are incorrectly created with mode 0555.

This replaces the hardcoded 0555 mode with the value of DirectoryMode.

Closes #13683.
---

diff --git a/src/core/automount.c b/src/core/automount.c
index bcdd7e19a99..a54e56c3122 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -568,7 +568,7 @@ static void automount_enter_waiting(Automount *a) {
         if (r < 0)
                 goto fail;
 
-        (void) mkdir_p_label(a->where, 0555);
+        (void) mkdir_p_label(a->where, a->directory_mode);
 
         unit_warn_if_dir_nonempty(UNIT(a), a->where);