pullup:

 376.   [bug]           The server should always use good entropy when
                        performing cryptographic functions needing entropy.

diff --git a/CHANGES b/CHANGES
index 7a70dcf1513b05f56cf8121c94107ff1b495d79b..73e1e4ee7237e51e59e2aa137183f15fc337f18b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+
+ 376.  [bug]           The server should always use good entropy when
+                       performing cryptographic functions needing entropy.
+
  375.  [bug]           Per-zone allow-query did not properly override the
                        view/global one for CNAME targets and additional
                        data [RT #220].

diff --git a/bin/named/server.c b/bin/named/server.c
index f3717b890e11e8fea37ec70a17c57562a1964e91..c7f391a443cf46b65d2505c875516906346ba9d9 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: server.c,v 1.200.2.3 2000/07/26 23:20:15 bwelling Exp $ */
+/* $Id: server.c,v 1.200.2.4 2000/08/08 19:25:50 gson Exp $ */
 
 #include <config.h>
 
@@ -1576,7 +1576,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
                   ISC_R_NOMEMORY : ISC_R_SUCCESS,
                   "allocating reload event");
 
-       CHECKFATAL(dst_lib_init(ns_g_mctx, ns_g_entropy, 0),
+       CHECKFATAL(dst_lib_init(ns_g_mctx, ns_g_entropy, ISC_ENTROPY_GOODONLY),
                   "initializing DST");
 
        server->tkeyctx = NULL;