3195. [cleanup] Silence "file not found" warnings when loading

			managed-keys zone. [RT #26340]

diff --git a/CHANGES b/CHANGES
index ce7604ddc5fc0903ecffaf47fe160adfb306add9..9b5ff501f108d9e4b8985b94156c9f08facd2f36 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3195.  [cleanup]       Silence "file not found" warnings when loading
+                       managed-keys zone. [RT #26340]
+
 3194.  [doc]           Updated RFC references in the 'empty-zones-enable'
                        documentation. [RT #25203]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c570cf663493f544230a51abfacd916060d157ae..443376830481f126876b80d6463459f2a55e4d55 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.645 2011/11/03 02:54:47 each Exp $ */
+/* $Id: zone.c,v 1.646 2011/11/03 03:26:19 each Exp $ */
 
 /*! \file */
 
@@ -3514,7 +3514,11 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
                                     "no master file, requesting db");
                        maybe_send_securedb(zone);
                } else {
-                       dns_zone_log(zone, ISC_LOG_ERROR,
+                       int level = ISC_LOG_ERROR;
+                       if (zone->type == dns_zone_key &&
+                           result == ISC_R_FILENOTFOUND)
+                               level = ISC_LOG_DEBUG(1);
+                       dns_zone_log(zone, level,
                                     "loading from master file %s failed: %s",
                                     zone->masterfile,
                                     dns_result_totext(result));