From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Aug 2022 12:07:27 +0000 (+0200)
Subject: conf-files: port conf_files_list() over to chase_symlinks() from prefix_roota()
X-Git-Tag: v252-rc1~377^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24392%2Fhead;p=thirdparty%2Fsystemd.git

conf-files: port conf_files_list() over to chase_symlinks() from prefix_roota()
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 82c6dc5677b..532c9d19b83 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "chase-symlinks.h"
 #include "conf-files.h"
 #include "def.h"
 #include "dirent-util.h"
@@ -28,23 +29,19 @@ static int files_add(
                 unsigned flags,
                 const char *path) {
 
+        _cleanup_free_ char *dirpath = NULL;
         _cleanup_closedir_ DIR *dir = NULL;
-        const char *dirpath;
         int r;
 
         assert(h);
         assert((flags & CONF_FILES_FILTER_MASKED) == 0 || masked);
         assert(path);
 
-        dirpath = prefix_roota(root, path);
-
-        dir = opendir(dirpath);
-        if (!dir) {
-                if (errno == ENOENT)
-                        return 0;
-
-                return log_debug_errno(errno, "Failed to open directory '%s': %m", dirpath);
-        }
+        r = chase_symlinks_and_opendir(path, root, CHASE_PREFIX_ROOT, &dirpath, &dir);
+        if (r == -ENOENT)
+                return 0;
+        if (r < 0)
+                return log_debug_errno(r, "Failed to open directory '%s/%s': %m", empty_or_root(root) ? "" : root, dirpath);
 
         FOREACH_DIRENT(de, dir, return -errno) {
                 struct stat st;