X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles.c;h=21bf44d3a41b57897072edfccf9e313452b26a4b;hb=689b9a22f7fa89686b2b5240b7ee9f449dea5630;hp=421a9154c5b0c1cdee9a21460f146ff2ddcb8390;hpb=4c12626c8e3491570b395d68380543e10c98ad33;p=elogind.git diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 421a9154c..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;