X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Frandom-seed.c;h=ee5cae315c24db36e5a7749a94786275920a8601;hb=e99fa3cba5c0a07bdcea22a308bf9b973e88b624;hp=586c69837b337dc39e85f40b7e0ff5eeb56f1f2e;hpb=26192dfc21a9020564e6db5c1dd9d49ecc70c0d7;p=elogind.git

diff --git a/src/random-seed.c b/src/random-seed.c
index 586c69837..ee5cae315 100644
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -32,7 +32,7 @@
 
 int main(int argc, char *argv[]) {
         int seed_fd = -1, random_fd = -1;
-        int ret = 1;
+        int ret = EXIT_FAILURE;
         void* buf;
         size_t buf_size = 0;
         ssize_t r;
@@ -40,13 +40,15 @@ int main(int argc, char *argv[]) {
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         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);
@@ -61,6 +63,11 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (mkdir_parents(RANDOM_SEED, 0755) < 0) {
+                log_error("Failed to create directories parents of %s: %m", RANDOM_SEED);
+                goto finish;
+        }
+
         /* When we load the seed we read it and write it to the device
          * and then immediately update the saved seed with new data,
          * to make sure the next boot gets seeded differently. */
@@ -81,9 +88,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)
@@ -119,7 +128,7 @@ int main(int argc, char *argv[]) {
                         log_error("Failed to write new random seed file: %s", r < 0 ? strerror(errno) : "short write");
         }
 
-        ret = 0;
+        ret = EXIT_SUCCESS;
 
 finish:
         if (random_fd >= 0)