X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftmpfiles%2Ftmpfiles.c;h=89f6c6bd15696037e3004d2f2a6a886a93b45002;hp=f4885ec942ec515e9506f5dc6bf60f288d7d99ac;hb=e73a03e059830a3df8fac811f923704311e93731;hpb=ef42202ac8ed27e7ff1fc90ef8bc2590046dff25 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index f4885ec94..89f6c6bd1 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -51,6 +51,9 @@ #include "set.h" #include "conf-files.h" #include "capability.h" +#include "specifier.h" +#include "build.h" +#include "copy.h" /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create @@ -61,21 +64,23 @@ typedef enum ItemType { /* These ones take file names */ CREATE_FILE = 'f', TRUNCATE_FILE = 'F', - WRITE_FILE = 'w', CREATE_DIRECTORY = 'd', TRUNCATE_DIRECTORY = 'D', CREATE_FIFO = 'p', CREATE_SYMLINK = 'L', CREATE_CHAR_DEVICE = 'c', CREATE_BLOCK_DEVICE = 'b', + COPY_FILES = 'C', /* These ones take globs */ + WRITE_FILE = 'w', IGNORE_PATH = 'x', IGNORE_DIRECTORY_PATH = 'X', REMOVE_PATH = 'r', RECURSIVE_REMOVE_PATH = 'R', + ADJUST_MODE = 'm', /* legacy, 'z' is identical to this */ RELABEL_PATH = 'z', - RECURSIVE_RELABEL_PATH = 'Z' + RECURSIVE_RELABEL_PATH = 'Z', } ItemType; typedef struct Item { @@ -104,8 +109,11 @@ static Set *unix_sockets = NULL; static bool arg_create = false; static bool arg_clean = false; static bool arg_remove = false; +static bool arg_boot = false; -static const char *arg_prefix = NULL; +static char **include_prefixes = NULL; +static char **exclude_prefixes = NULL; +static char *arg_root = NULL; static const char conf_file_dirs[] = "/etc/tmpfiles.d\0" @@ -120,7 +128,15 @@ static const char conf_file_dirs[] = #define MAX_DEPTH 256 static bool needs_glob(ItemType t) { - return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH; + return IN_SET(t, + WRITE_FILE, + IGNORE_PATH, + IGNORE_DIRECTORY_PATH, + REMOVE_PATH, + RECURSIVE_REMOVE_PATH, + ADJUST_MODE, + RELABEL_PATH, + RECURSIVE_RELABEL_PATH); } static struct Item* find_glob(Hashmap *h, const char *match) { @@ -211,19 +227,20 @@ static bool unix_socket_alive(const char *fn) { } static int dir_is_mount_point(DIR *d, const char *subdir) { - struct file_handle *h; + + union file_handle_union h = { + .handle.handle_bytes = MAX_HANDLE_SZ + }; + int mount_id_parent, mount_id; int r_p, r; - h = alloca(MAX_HANDLE_SZ); - - h->handle_bytes = MAX_HANDLE_SZ; - r_p = name_to_handle_at(dirfd(d), ".", h, &mount_id_parent, 0); + r_p = name_to_handle_at(dirfd(d), ".", &h.handle, &mount_id_parent, 0); if (r_p < 0) r_p = -errno; - h->handle_bytes = MAX_HANDLE_SZ; - r = name_to_handle_at(dirfd(d), subdir, h, &mount_id, 0); + h.handle.handle_bytes = MAX_HANDLE_SZ; + r = name_to_handle_at(dirfd(d), subdir, &h.handle, &mount_id, 0); if (r < 0) r = -errno; @@ -255,8 +272,8 @@ static int dir_cleanup( dev_t rootdev, bool mountpoint, int maxdepth, - bool keep_this_level) -{ + bool keep_this_level) { + struct dirent *dent; struct timespec times[2]; bool deleted = false; @@ -272,12 +289,15 @@ static int dir_cleanup( continue; if (fstatat(dirfd(d), dent->d_name, &s, AT_SYMLINK_NOFOLLOW) < 0) { + if (errno == ENOENT) + continue; - if (errno != ENOENT) { + /* FUSE, NFS mounts, SELinux might return EACCES */ + if (errno == EACCES) + log_debug("stat(%s/%s) failed: %m", p, dent->d_name); + else log_error("stat(%s/%s) failed: %m", p, dent->d_name); - r = -errno; - } - + r = -errno; continue; } @@ -295,7 +315,8 @@ static int dir_cleanup( if (s.st_uid == 0 && !(s.st_mode & S_IWUSR)) continue; - if (asprintf(&sub_path, "%s/%s", p, dent->d_name) < 0) { + sub_path = strjoin(p, "/", dent->d_name, NULL); + if (!sub_path) { r = log_oom(); goto finish; } @@ -321,7 +342,7 @@ static int dir_cleanup( int q; sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME); - if (sub_dir == NULL) { + if (!sub_dir) { if (errno != ENOENT) { log_error("opendir(%s/%s) failed: %m", p, dent->d_name); r = -errno; @@ -331,7 +352,6 @@ static int dir_cleanup( } q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false); - if (q < 0) r = q; } @@ -353,7 +373,7 @@ static int dir_cleanup( continue; if (i->type != IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) { - log_debug("rmdir '%s'\n", sub_path); + log_debug("rmdir '%s'", sub_path); if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) { if (errno != ENOENT && errno != ENOTEMPTY) { @@ -401,7 +421,7 @@ static int dir_cleanup( if (age >= cutoff) continue; - log_debug("unlink '%s'\n", sub_path); + log_debug("unlink '%s'", sub_path); if (unlinkat(dirfd(d), dent->d_name, 0) < 0) { if (errno != ENOENT) { @@ -427,12 +447,17 @@ finish: return r; } -static int item_set_perms(Item *i, const char *path) { +static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) { + assert(i); + assert(path); + /* not using i->path directly because it may be a glob */ if (i->mode_set) if (chmod(path, i->mode) < 0) { - log_error("chmod(%s) failed: %m", path); - return -errno; + if (errno != ENOENT || !ignore_enoent) { + log_error("chmod(%s) failed: %m", path); + return -errno; + } } if (i->uid_set || i->gid_set) @@ -440,16 +465,27 @@ static int item_set_perms(Item *i, const char *path) { i->uid_set ? i->uid : (uid_t) -1, i->gid_set ? i->gid : (gid_t) -1) < 0) { - log_error("chown(%s) failed: %m", path); - return -errno; + if (errno != ENOENT || !ignore_enoent) { + log_error("chown(%s) failed: %m", path); + return -errno; + } } - return label_fix(path, false, false); + return label_fix(path, ignore_enoent, false); +} + +static int item_set_perms(Item *i, const char *path) { + return item_set_perms_full(i, path, false); } static int write_one_file(Item *i, const char *path) { - int r, e, fd, flags; + int flags; + int fd = -1; struct stat st; + int r = 0; + + assert(i); + assert(path); flags = i->type == CREATE_FILE ? O_CREAT|O_APPEND : i->type == TRUNCATE_FILE ? O_CREAT|O_TRUNC : 0; @@ -457,9 +493,7 @@ static int write_one_file(Item *i, const char *path) { RUN_WITH_UMASK(0) { label_context_set(path, S_IFREG); fd = open(path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, i->mode); - e = errno; label_context_clear(); - errno = e; } if (fd < 0) { @@ -471,13 +505,13 @@ static int write_one_file(Item *i, const char *path) { } if (i->argument) { + _cleanup_free_ char *unescaped; ssize_t n; size_t l; - _cleanup_free_ char *unescaped; unescaped = cunescape(i->argument); if (unescaped == NULL) { - close_nointr_nofail(fd); + safe_close(fd); return log_oom(); } @@ -486,12 +520,12 @@ static int write_one_file(Item *i, const char *path) { if (n < 0 || (size_t) n < l) { log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write"); - close_nointr_nofail(fd); + safe_close(fd); return n < 0 ? n : -EIO; } } - close_nointr_nofail(fd); + safe_close(fd); if (stat(path, &st) < 0) { log_error("stat(%s) failed: %m", path); @@ -510,110 +544,90 @@ static int write_one_file(Item *i, const char *path) { return 0; } -static int recursive_relabel_children(Item *i, const char *path) { +static int item_set_perms_children(Item *i, const char *path) { _cleanup_closedir_ DIR *d; - int ret = 0; + int r = 0; + + assert(i); + assert(path); /* This returns the first error we run into, but nevertheless * tries to go on */ d = opendir(path); if (!d) - return errno == ENOENT ? 0 : -errno; + return errno == ENOENT || errno == ENOTDIR ? 0 : -errno; for (;;) { + _cleanup_free_ char *p = NULL; struct dirent *de; - union dirent_storage buf; - bool is_dir; - int r; - _cleanup_free_ char *entry_path = NULL; - - r = readdir_r(d, &buf.de, &de); - if (r != 0) { - if (ret == 0) - ret = -r; - break; - } + int q; + + errno = 0; + de = readdir(d); + if (!de) { + if (errno != 0 && r == 0) + r = -errno; - if (!de) break; + } if (streq(de->d_name, ".") || streq(de->d_name, "..")) continue; - if (asprintf(&entry_path, "%s/%s", path, de->d_name) < 0) { - if (ret == 0) - ret = -ENOMEM; - continue; - } - - if (de->d_type == DT_UNKNOWN) { - struct stat st; - - if (lstat(entry_path, &st) < 0) { - if (ret == 0 && errno != ENOENT) - ret = -errno; - continue; - } - - is_dir = S_ISDIR(st.st_mode); - - } else - is_dir = de->d_type == DT_DIR; + p = strjoin(path, "/", de->d_name, NULL); + if (!p) + return -ENOMEM; - r = item_set_perms(i, entry_path); - if (r < 0) { - if (ret == 0 && r != -ENOENT) - ret = r; - continue; - } + q = item_set_perms(i, p); + if (q < 0 && q != -ENOENT && r == 0) + r = q; - if (is_dir) { - r = recursive_relabel_children(i, entry_path); - if (r < 0 && ret == 0) - ret = r; + if (IN_SET(de->d_type, DT_UNKNOWN, DT_DIR)) { + q = item_set_perms_children(i, p); + if (q < 0 && r == 0) + r = q; } } - return ret; + return r; } -static int recursive_relabel(Item *i, const char *path) { - int r; - struct stat st; +static int item_set_perms_recursive(Item *i, const char *path) { + int r, q; + + assert(i); + assert(path); r = item_set_perms(i, path); if (r < 0) return r; - if (lstat(path, &st) < 0) - return -errno; - - if (S_ISDIR(st.st_mode)) - r = recursive_relabel_children(i, path); + q = item_set_perms_children(i, path); + if (q < 0 && r == 0) + r = q; return r; } static int glob_item(Item *i, int (*action)(Item *, const char *)) { - int r = 0, k; _cleanup_globfree_ glob_t g = {}; + int r = 0, k; char **fn; errno = 0; k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g); - if (k != 0) - if (k != GLOB_NOMATCH) { - if (errno > 0) - errno = EIO; + if (k != 0 && k != GLOB_NOMATCH) { + if (errno == 0) + errno = EIO; - log_error("glob(%s) failed: %m", i->path); - return -errno; - } + log_error("glob(%s) failed: %m", i->path); + return -errno; + } STRV_FOREACH(fn, g.gl_pathv) { k = action(i, *fn); - if (k < 0) + if (k < 0 && r == 0) r = k; } @@ -621,8 +635,8 @@ static int glob_item(Item *i, int (*action)(Item *, const char *)) { } static int create_item(Item *i) { - int r, e; struct stat st; + int r = 0; assert(i); @@ -640,6 +654,20 @@ static int create_item(Item *i) { if (r < 0) return r; break; + + case COPY_FILES: + r = copy_tree(i->argument, i->path); + if (r < 0) { + log_error("Failed to copy files: %s", strerror(-r)); + return r; + } + + r = item_set_perms(i, i->path); + if (r < 0) + return r; + + break; + case WRITE_FILE: r = glob_item(i, write_one_file); if (r < 0) @@ -704,13 +732,11 @@ static int create_item(Item *i) { break; case CREATE_SYMLINK: { - char *x; + _cleanup_free_ char *x = NULL; label_context_set(i->path, S_IFLNK); r = symlink(i->argument, i->path); - e = errno; label_context_clear(); - errno = e; if (r < 0 && errno != EEXIST) { log_error("symlink(%s, %s) failed: %m", i->argument, i->path); @@ -724,12 +750,10 @@ static int create_item(Item *i) { } if (!streq(i->argument, x)) { - free(x); log_error("%s is not the right symlinks.", i->path); return -EEXIST; } - free(x); break; } @@ -752,9 +776,7 @@ static int create_item(Item *i) { RUN_WITH_UMASK(0000) { label_context_set(i->path, file_type); r = mknod(i->path, i->mode | file_type, i->major_minor); - e = errno; label_context_clear(); - errno = e; } if (r < 0 && errno != EEXIST) { @@ -779,18 +801,21 @@ static int create_item(Item *i) { break; } + case ADJUST_MODE: case RELABEL_PATH: r = glob_item(i, item_set_perms); if (r < 0) - return 0; + return r; break; case RECURSIVE_RELABEL_PATH: - r = glob_item(i, recursive_relabel); + r = glob_item(i, item_set_perms_recursive); if (r < 0) return r; + + break; } log_debug("%s created successfully.", i->path); @@ -814,9 +839,11 @@ static int remove_item_instance(Item *i, const char *instance) { case CREATE_CHAR_DEVICE: case IGNORE_PATH: case IGNORE_DIRECTORY_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: case WRITE_FILE: + case COPY_FILES: break; case REMOVE_PATH: @@ -859,9 +886,11 @@ static int remove_item(Item *i) { case CREATE_BLOCK_DEVICE: case IGNORE_PATH: case IGNORE_DIRECTORY_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: case WRITE_FILE: + case COPY_FILES: break; case REMOVE_PATH: @@ -933,6 +962,7 @@ static int clean_item(Item *i) { case CREATE_DIRECTORY: case TRUNCATE_DIRECTORY: case IGNORE_PATH: + case COPY_FILES: clean_item_instance(i, i->path); break; case IGNORE_DIRECTORY_PATH: @@ -971,6 +1001,8 @@ static void item_free(Item *i) { free(i); } +DEFINE_TRIVIAL_CLEANUP_FUNC(Item*, item_free); + static bool item_equal(Item *a, Item *b) { assert(a); assert(b); @@ -1000,7 +1032,8 @@ static bool item_equal(Item *a, Item *b) { if ((a->type == CREATE_FILE || a->type == TRUNCATE_FILE || a->type == WRITE_FILE || - a->type == CREATE_SYMLINK) && + a->type == CREATE_SYMLINK || + a->type == COPY_FILES) && !streq_ptr(a->argument, b->argument)) return false; @@ -1012,11 +1045,37 @@ static bool item_equal(Item *a, Item *b) { return true; } +static bool should_include_path(const char *path) { + char **prefix; + + STRV_FOREACH(prefix, exclude_prefixes) { + if (path_startswith(path, *prefix)) + return false; + } + + STRV_FOREACH(prefix, include_prefixes) { + if (path_startswith(path, *prefix)) + return true; + } + + /* no matches, so we should include this path only if we + * have no whitelist at all */ + return strv_length(include_prefixes) == 0; +} + static int parse_line(const char *fname, unsigned line, const char *buffer) { - _cleanup_free_ Item *i = NULL; + + static const Specifier specifier_table[] = { + { 'm', specifier_machine_id, NULL }, + { 'b', specifier_boot_id, NULL }, + { 'H', specifier_host_name, NULL }, + { 'v', specifier_kernel_release, NULL }, + {} + }; + + _cleanup_free_ char *action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL; + _cleanup_(item_freep) Item *i = NULL; Item *existing; - _cleanup_free_ char - *mode = NULL, *user = NULL, *group = NULL, *age = NULL; char type; Hashmap *h; int r, n = -1; @@ -1025,14 +1084,10 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { assert(line >= 1); assert(buffer); - i = new0(Item, 1); - if (!i) - return log_oom(); - r = sscanf(buffer, - "%c %ms %ms %ms %ms %ms %n", - &type, - &i->path, + "%ms %ms %ms %ms %ms %ms %n", + &action, + &path, &mode, &user, &group, @@ -1043,6 +1098,24 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { return -EIO; } + if (strlen(action) > 2 || (strlen(action) > 1 && action[1] != '!')) { + log_error("[%s:%u] Unknown modifier '%s'", fname, line, action); + return -EINVAL; + } else if (strlen(action) > 1 && !arg_boot) + return 0; + + type = action[0]; + + i = new0(Item, 1); + if (!i) + return log_oom(); + + r = specifier_printf(path, specifier_table, NULL, &i->path); + if (r < 0) { + log_error("[%s:%u] Failed to replace specifiers: %s", fname, line, path); + return r; + } + if (n >= 0) { n += strspn(buffer+n, WHITESPACE); if (buffer[n] != 0 && (buffer[n] != '-' || buffer[n+1] != 0)) { @@ -1063,6 +1136,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { case IGNORE_DIRECTORY_PATH: case REMOVE_PATH: case RECURSIVE_REMOVE_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: break; @@ -1072,6 +1146,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { log_error("[%s:%u] Symlink file requires argument.", fname, line); return -EBADMSG; } + break; case WRITE_FILE: @@ -1081,6 +1156,20 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { } break; + case COPY_FILES: + if (!i->argument) { + log_error("[%s:%u] Copy files requires argument.", fname, line); + return -EBADMSG; + } + + if (!path_is_absolute(i->argument)) { + log_error("[%s:%u] Source path is not absolute.", fname, line); + return -EBADMSG; + } + + path_kill_slashes(i->argument); + break; + case CREATE_CHAR_DEVICE: case CREATE_BLOCK_DEVICE: { unsigned major, minor; @@ -1113,9 +1202,20 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { path_kill_slashes(i->path); - if (arg_prefix && !path_startswith(i->path, arg_prefix)) + if (!should_include_path(i->path)) return 0; + if (arg_root) { + char *p; + + p = strappend(arg_root, i->path); + if (!p) + return log_oom(); + + free(i->path); + i->path = p; + } + if (user && !streq(user, "-")) { const char *u = user; @@ -1198,11 +1298,15 @@ static int help(void) { printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" "Creates, deletes and cleans up volatile and temporary files and directories.\n\n" - " -h --help Show this help\n" - " --create Create marked files/directories\n" - " --clean Clean up marked directories\n" - " --remove Remove marked files/directories\n" - " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", + " -h --help Show this help\n" + " --version Show package version\n" + " --create Create marked files/directories\n" + " --clean Clean up marked directories\n" + " --remove Remove marked files/directories\n" + " --boot Execute actions only safe at boot\n" + " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n" + " --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n" + " --root=PATH Operate on an alternate filesystem root\n", program_invocation_short_name); return 0; @@ -1211,19 +1315,27 @@ static int help(void) { static int parse_argv(int argc, char *argv[]) { enum { + ARG_VERSION = 0x100, ARG_CREATE, ARG_CLEAN, ARG_REMOVE, - ARG_PREFIX + ARG_BOOT, + ARG_PREFIX, + ARG_EXCLUDE_PREFIX, + ARG_ROOT, }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "create", no_argument, NULL, ARG_CREATE }, - { "clean", no_argument, NULL, ARG_CLEAN }, - { "remove", no_argument, NULL, ARG_REMOVE }, - { "prefix", required_argument, NULL, ARG_PREFIX }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "create", no_argument, NULL, ARG_CREATE }, + { "clean", no_argument, NULL, ARG_CLEAN }, + { "remove", no_argument, NULL, ARG_REMOVE }, + { "boot", no_argument, NULL, ARG_BOOT }, + { "prefix", required_argument, NULL, ARG_PREFIX }, + { "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX }, + { "root", required_argument, NULL, ARG_ROOT }, + {} }; int c; @@ -1236,7 +1348,11 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); + return help(); + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); return 0; case ARG_CREATE: @@ -1251,16 +1367,32 @@ static int parse_argv(int argc, char *argv[]) { arg_remove = true; break; + case ARG_BOOT: + arg_boot = true; + break; + case ARG_PREFIX: - arg_prefix = optarg; + if (strv_push(&include_prefixes, optarg) < 0) + return log_oom(); + break; + + case ARG_EXCLUDE_PREFIX: + if (strv_push(&exclude_prefixes, optarg) < 0) + return log_oom(); + break; + + case ARG_ROOT: + arg_root = path_make_absolute_cwd(optarg); + if (!arg_root) + return log_oom(); + path_kill_slashes(arg_root); break; case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -1273,15 +1405,16 @@ static int parse_argv(int argc, char *argv[]) { } static int read_config_file(const char *fn, bool ignore_enoent) { - FILE *f; - unsigned v = 0; - int r; + _cleanup_fclose_ FILE *f = NULL; + char line[LINE_MAX]; Iterator iterator; + unsigned v = 0; Item *i; + int r; assert(fn); - r = search_and_fopen_nulstr(fn, "re", conf_file_dirs, &f); + r = search_and_fopen_nulstr(fn, "re", arg_root, conf_file_dirs, &f); if (r < 0) { if (ignore_enoent && r == -ENOENT) return 0; @@ -1290,23 +1423,19 @@ static int read_config_file(const char *fn, bool ignore_enoent) { return r; } - log_debug("apply: %s\n", fn); - for (;;) { - char line[LINE_MAX], *l; + FOREACH_LINE(line, f, break) { + char *l; int k; - if (!(fgets(line, sizeof(line), f))) - break; - v++; l = strstrip(line); if (*l == '#' || *l == 0) continue; - if ((k = parse_line(fn, v, l)) < 0) - if (r == 0) - r = k; + k = parse_line(fn, v, l); + if (k < 0 && r == 0) + r = k; } /* we have to determine age parameter for each entry of type X */ @@ -1343,8 +1472,6 @@ static int read_config_file(const char *fn, bool ignore_enoent) { r = -EIO; } - fclose(f); - return r; } @@ -1388,7 +1515,7 @@ int main(int argc, char *argv[]) { _cleanup_strv_free_ char **files = NULL; char **f; - r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); + r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs); if (r < 0) { log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r)); goto finish; @@ -1417,6 +1544,10 @@ finish: hashmap_free(items); hashmap_free(globs); + free(include_prefixes); + free(exclude_prefixes); + free(arg_root); + set_free_free(unix_sockets); label_finish();