SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conf-files: drop use of CONF_FILES_CHASE_BASENAME in conf_files_list_with_replacement()

Browse Source 
The flag has several potential issues, and will be dropped in the next
commit.

Follow-up for 41fb58595a.
This commit is contained in:
Yu Watanabe
2025-06-29 10:15:56 +09:00
parent 2d0ec7f900
commit c43223ff9f
2 changed files with 41 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/conf-files.c
+1 -10
View File
@@ -295,15 +295,6 @@ static int conf_files_list_impl(
resolved_replacement = path_join(resolved_dirpath_replacement, filename_replacement);
if (!resolved_replacement)
return log_oom_debug();
if (FLAGS_SET(flags, CONF_FILES_CHASE_BASENAME)) {
_cleanup_free_ char *p = NULL;
r = chaseat(rfd, resolved_replacement, CHASE_AT_RESOLVE_IN_ROOT | CHASE_NONEXISTENT, &p, /* ret_fd = */ NULL);
if (r < 0)
return r;
free_and_replace(resolved_replacement, p);
}
}
STRV_FOREACH(p, dirs) {
@@ -428,7 +419,7 @@ int conf_files_list_with_replacement(
_cleanup_hashmap_free_ Hashmap *fh = NULL;
_cleanup_free_ char *inserted = NULL;
ConfFilesFlags flags = CONF_FILES_REGULAR | CONF_FILES_CHASE_BASENAME | CONF_FILES_FILTER_MASKED_BY_SYMLINK;
ConfFilesFlags flags = CONF_FILES_REGULAR | CONF_FILES_FILTER_MASKED_BY_SYMLINK;
int r;
assert(ret_files);