From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 9 Jan 2023 01:53:20 +0000 (+0900)
Subject: tmpfile: make failure in path_extract_filename() non-critical
X-Git-Tag: v253-rc1~154^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da8f9c4661397db8b125e8c843d861430f265e71;p=thirdparty%2Fsystemd.git

tmpfile: make failure in path_extract_filename() non-critical
---

diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c
index 085286e9921..fe866f8ca1b 100644
--- a/src/tmpfiles/offline-passwd.c
+++ b/src/tmpfiles/offline-passwd.c
@@ -9,10 +9,9 @@
 DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free);
 
 static int open_passwd_file(const char *root, const char *fname, FILE **ret_file) {
-        _cleanup_free_ char *p = NULL, *bn = NULL;
+        _cleanup_free_ char *p = NULL;
         _cleanup_close_ int fd = -EBADF;
         _cleanup_fclose_ FILE *f = NULL;
-        int r;
 
         fd = chase_symlinks_and_open(fname, root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, &p);
         if (fd < 0)
@@ -24,11 +23,12 @@ static int open_passwd_file(const char *root, const char *fname, FILE **ret_file
 
         TAKE_FD(fd);
 
-        r = path_extract_filename(fname, &bn);
-        if (r < 0)
-                return r;
+        if (DEBUG_LOGGING) {
+                _cleanup_free_ char *bn = NULL;
 
-        log_debug("Reading %s entries from %s...", bn, p);
+                (void) path_extract_filename(fname, &bn);
+                log_debug("Reading %s entries from %s...", strna(bn), p);
+        }
 
         *ret_file = TAKE_PTR(f);
         return 0;