pullup:

 804.   [bug]           Attempting to obtain entropy could fail in some
                        situations.  This would be most common on systems

diff --git a/CHANGES b/CHANGES
index a1fc531c5f05fb6069dbc882ab9772eab7905755..7564282305d1650d1f8ed0d9b15f5936218204ef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
+ 804.  [bug]           Attempting to obtain entropy could fail in some
+                       situations.  This would be most common on systems
+                       with user-space threads. [RT #1131]
+
  800.  [bug]           dnssec-signzone produced incorrect statistics for
-                       large zones.  [RT #1133]
+                       large zones. [RT #1133]
 
  799.  [bug]           The ADB didn't find AAAA glue in a zone unless A6
                        glue was also present.

diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 79c801f8bf4d84d4150420539e39bb3b53e8e7c4..928e0c55e0d4cf9e5945eab7c58fcb305888b46a 100644 (file)
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.54.2.2 2001/02/05 23:31:05 gson Exp $ */
+/* $Id: entropy.c,v 1.54.2.3 2001/04/10 00:24:47 gson Exp $ */
 
 #include <config.h>
 
@@ -390,7 +390,7 @@ get_from_filesource(isc_entropysource_t *source, isc_uint32_t desired) {
                ndesired = ISC_MIN(desired, sizeof(buf));
                n = read(fd, buf, ndesired);
                if (n < 0) {
-                       if (errno == EAGAIN)
+                       if (errno == EAGAIN || errno == EINTR)
                                goto out;
                        close(fd);
                        source->bad = ISC_TRUE;