From 984c39beed2fee49dda75c4c8a37b7f32bf434bf Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 17 Apr 2002 01:23:15 +0000
Subject: [PATCH] 1269.   [bug]           Missing masters clause was not
 handled gracefully.                         [RT #2703]

---
 CHANGES           |  3 +++
 lib/bind9/check.c | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 318caae748..e06760bda2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1269.	[bug]		Missing masters clause was not handled gracefully.
+			[RT #2703]
+
 1268.	[bug]		DESTDIR was not being propogated between makes.
 
 1247.	[bug]		Don't reset the interface index for link/site local
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 0277de23ba..5bc5f4058e 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.31 2002/03/14 00:43:00 bwelling Exp $ */
+/* $Id: check.c,v 1.32 2002/04/17 01:23:15 marka Exp $ */
 
 #include <config.h>
 
@@ -413,13 +413,14 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab,
 				    "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;
+			}
 		}
 	}