2814. [func] Provide a definitive error message when a master

                        zone is not loaded. [RT #20757]

diff --git a/CHANGES b/CHANGES
index 504d28502e6ea075800ef0177d40a654797f64b2..e1185a8b25aa3a1b163db3fd94d745140af40cea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2814.  [func]          Provide a definitive error message when a master
+                       zone is not loaded. [RT #20757]
+ 
 2797.  [bug]           Don't decrement the dispatch manager's maxbuffers.
                        [RT #20613]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 233f74cede5dc716ca46d0c6163317bb4d56a321..25c8687d79a681406f1b7bb84ab4c06e661de8ef 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.470.12.15 2009/11/12 23:43:36 marka Exp $ */
+/* $Id: zone.c,v 1.470.12.16 2009/12/21 04:34:08 marka Exp $ */
 
 /*! \file */
 
@@ -2305,7 +2305,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
                if (zone->task != NULL)
                        zone_settimer(zone, &now);
                result = ISC_R_SUCCESS;
-       }
+       } else if (zone->type == dns_zone_master)
+               dns_zone_log(zone, ISC_LOG_ERROR, "not loaded due to errors.");
        return (result);
 }