tmpfiles: ensure we do no follow symlinks when cleaning up dirs

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index d12b5e772da601b9379e0c0efde09481564d7a56..60af4fe60d4dfce08e66a92632e30dbada029d3f 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3048,6 +3048,7 @@ void status_welcome(void) {
 
         if (!pretty_name) {
                 char *version;
+
                 if ((r = read_one_line_file("/etc/debian_version", &version)) < 0) {
 
                         if (r != -ENOENT)
@@ -3056,6 +3057,9 @@ void status_welcome(void) {
                         truncate_nl(version);
                         pretty_name = strappend("Debian ", version);
                         free(version);
+
+                        if (!pretty_name)
+                                log_warning("Failed to allocate Debian version string.");
                 }
         }
 
@@ -3398,8 +3402,8 @@ bool null_or_empty(struct stat *st) {
         return false;
 }
 
-DIR *xopendirat(int fd, const char *name) {
-        return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
+DIR *xopendirat(int fd, const char *name, int flags) {
+        return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags));
 }
 
 int signal_from_string_try_harder(const char *s) {