From: Evan Hunt <each@isc.org>
Date: Tue, 29 Nov 2016 19:30:31 +0000 (-0800)
Subject: [master] log as error if entropy unavailable
X-Git-Tag: v9.12.0a1~634
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6bdb70057d1505f86816b77edee8bc66c5e428ba;p=thirdparty%2Fbind9.git

[master] log as error if entropy unavailable

4521.	[cleanup]	Log it as an error if an entropy source is not
			found and there is no fallback available. [RT #43659]
---

diff --git a/CHANGES b/CHANGES
index a9edd588269..b2e0c238495 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4521.	[cleanup]	Log it as an error if an entropy source is not
+			found and there is no fallback available. [RT #43659]
+
 4520.	[cleanup]	Alphabetise more of the grammar when printing it
 			out. Fix unbalanced indenting. [RT #43755]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 6cff5a9675e..ef33ed5b416 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -7733,13 +7733,18 @@ load_configuration(const char *filename, ns_server_t *server,
 				      "no source of entropy found");
 		} else {
 			const char *randomdev = cfg_obj_asstring(obj);
+			int level = ISC_LOG_ERROR;
 			result = isc_entropy_createfilesource(ns_g_entropy,
 							      randomdev);
+#ifdef PATH_RANDOMDEV
+			if (ns_g_fallbackentropy != NULL)
+				level = ISC_LOG_INFO;
+#endif
 			if (result != ISC_R_SUCCESS)
 				isc_log_write(ns_g_lctx,
 					      NS_LOGCATEGORY_GENERAL,
 					      NS_LOGMODULE_SERVER,
-					      ISC_LOG_INFO,
+					      level,
 					      "could not open entropy source "
 					      "%s: %s",
 					      randomdev,