units: make sure syslog socket goes away early during shutdown

[elogind.git] / src / random-seed.c

diff --git a/src/random-seed.c b/src/random-seed.c
index 8eab2b4e1ce3d9f99f5a5c7be1bb1812e0d6ab30..0c63794b66839e7cb3fb6f97830ddfc1f003e17b 100644 (file)
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -47,9 +47,15 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
+        umask(0022);
+
         /* Read pool size, if possible */
         if ((f = fopen("/proc/sys/kernel/random/poolsize", "re"))) {
-                fscanf(f, "%zu", &buf_size);
+                if (fscanf(f, "%zu", &buf_size) > 0) {
+                        /* poolsize is in bits on 2.6, but we want bytes */
+                        buf_size /= 8;
+                }
+
                 fclose(f);
         }
 
@@ -86,9 +92,11 @@ int main(int argc, char *argv[]) {
                         }
                 }
 
-                if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0)
-                        log_error("Failed to read seed file: %s", r < 0 ? strerror(errno) : "EOF");
-                else {
+                if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0) {
+
+                        if (r != 0)
+                                log_error("Failed to read seed file: %m");
+                } else {
                         lseek(seed_fd, 0, SEEK_SET);
 
                         if ((r = loop_write(random_fd, buf, (size_t) r, false)) <= 0)