summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--entropy.c9
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 481a13321..4279d956a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120010117
2 - (djm) Only write random seed file at exit
3
120010115 420010115
2 - (bal) sftp-server.c change to use chmod() if fchmod() does not exist. 5 - (bal) sftp-server.c change to use chmod() if fchmod() does not exist.
3 - (bal) utimes() support via utime() interface on machine that lack utimes(). 6 - (bal) utimes() support via utime() interface on machine that lack utimes().
diff --git a/entropy.c b/entropy.c
index 2929c3fd7..7cbc6951e 100644
--- a/entropy.c
+++ b/entropy.c
@@ -35,7 +35,7 @@
35# include <floatingpoint.h> 35# include <floatingpoint.h>
36#endif /* HAVE_FLOATINGPOINT_H */ 36#endif /* HAVE_FLOATINGPOINT_H */
37 37
38RCSID("$Id: entropy.c,v 1.22 2000/11/24 23:09:32 djm Exp $"); 38RCSID("$Id: entropy.c,v 1.23 2001/01/16 22:37:15 djm Exp $");
39 39
40#ifndef offsetof 40#ifndef offsetof
41# define offsetof(type, member) ((size_t) &((type *)0)->member) 41# define offsetof(type, member) ((size_t) &((type *)0)->member)
@@ -601,12 +601,7 @@ prng_read_seedfile(void) {
601 debug("loading PRNG seed from file %.100s", filename); 601 debug("loading PRNG seed from file %.100s", filename);
602 602
603 if (!prng_check_seedfile(filename)) { 603 if (!prng_check_seedfile(filename)) {
604 verbose("Random seed file not found, creating new"); 604 verbose("Random seed file not found or not valid, ignoring.");
605 prng_write_seedfile();
606
607 /* Reseed immediatly */
608 (void)stir_from_system();
609 (void)stir_from_programs();
610 return; 605 return;
611 } 606 }
612 607