X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles.c;h=21bf44d3a41b57897072edfccf9e313452b26a4b;hb=75d3fc60f88e08bf953063819a8a04b881d6db23;hp=3a1985a36334c1b01dd1b6651fa39dbb89fd71fd;hpb=4b67834e9f8a336dbc917f3bf212550e61cc98b4;p=elogind.git diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 3a1985a36..21bf44d3a 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -157,6 +157,7 @@ static void load_unix_sockets(void) { } } + fclose(f); return; fail: @@ -586,7 +587,7 @@ static int remove_item(Item *i, const char *instance) { case TRUNCATE_DIRECTORY: case RECURSIVE_REMOVE_PATH: - if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH)) < 0 && + if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH, false)) < 0 && r != -ENOENT) { log_error("rm_rf(%s): %s", instance, strerror(-r)); return r; @@ -972,6 +973,8 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); + umask(0022); + label_init(); items = hashmap_new(string_hash_func, string_compare_func);