From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Oct 2024 13:35:25 +0000 (+0200)
Subject: dropin: use WRITE_STRING_FILE_MKDIR_0755 to create drop-in prefix path
X-Git-Tag: v257-rc1~212^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5048a6bd65bb703f91ad14f293ca349956307e4a;p=thirdparty%2Fsystemd.git

dropin: use WRITE_STRING_FILE_MKDIR_0755 to create drop-in prefix path
---

diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index de93e120e09..3e1eaa66236 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -75,7 +75,7 @@ int write_drop_in(
                 const char *name,
                 const char *data) {
 
-        _cleanup_free_ char *p = NULL, *q = NULL;
+        _cleanup_free_ char *p = NULL;
         int r;
 
         assert(dir);
@@ -83,12 +83,11 @@ int write_drop_in(
         assert(name);
         assert(data);
 
-        r = drop_in_file(dir, unit, level, name, &p, &q);
+        r = drop_in_file(dir, unit, level, name, /* ret_unit_dir= */ NULL, &p);
         if (r < 0)
                 return r;
 
-        (void) mkdir_p(p, 0755);
-        return write_string_file_atomic_label(q, data);
+        return write_string_file_at_label(AT_FDCWD, p, data, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_MKDIR_0755);
 }
 
 int write_drop_in_format(