reviewed by: bwelling@nominum.com

1269.   [bug]           Missing masters clause was not handled gracefully.
                        [RT #2703]

diff --git a/CHANGES b/CHANGES
index a5d4672ce68e5950a3629d01a6598f3f4475e3be..5807090b99a3d5813ee38b367dcb93b36514bc2e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 1271.  [port]          win32: a make file contained absolute version specific
                        references.
 
+1269.  [bug]           Missing masters clause was not handled gracefully.
+                       [RT #2703]
+
 1244.  [bug]           Receiving a TCP message from a blackhole address would
                        prevent further messages being received over that
                        interface.

diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index 2fe46e3a594b94d6b4cb8fe892f64d5bd4eb7bed..b762c73bb5eb1dd1fcc86c930d1434bf49032d62 100644 (file)
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.14.2.15 2002/03/20 20:21:15 marka Exp $ */
+/* $Id: check.c,v 1.14.2.16 2002/04/23 02:00:03 marka Exp $ */
 
 #include <config.h>
 
@@ -261,13 +261,14 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx,
                                    "zone '%s': missing 'masters' entry",
                                    zname);
                        result = ISC_R_FAILURE;
-               }
-               addrlist = cfg_tuple_get(obj, "addresses");
-               if (cfg_list_first(addrlist) == NULL) {
-                       cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR,
-                                   "zone '%s': empty 'masters' entry",
-                                   zname);
-                       result = ISC_R_FAILURE;
+               } else {
+                       addrlist = cfg_tuple_get(obj, "addresses");
+                       if (cfg_list_first(addrlist) == NULL) {
+                               cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR,
+                                           "zone '%s': empty 'masters' entry",
+                                           zname);
+                               result = ISC_R_FAILURE;
+                       }
                }
        }