From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Sep 2013 23:40:21 +0000 (+1000)
Subject: 3653.   [func]          Create delegations for all "children" of empty zones
X-Git-Tag: v9.6-ESV-R11b1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09b7d5191f6e8a0aa644984657d311abcd1f94a0;p=thirdparty%2Fbind9.git

3653.   [func]          Create delegations for all "children" of empty zones
                        except "forward first". [RT #34826]

(cherry picked from commit 00043fc284892099b309be37340ae80893146c69)
---

diff --git a/CHANGES b/CHANGES
index 8a13b5997d6..81d8b4feb8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3653.	[func]		Create delegations for all "children" of empty zones
+			except "forward first". [RT #34826]
+
 3651.	[tuning]	Adjust when a master server is deemed unreachable.
 			[RT #27075]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 02f85903875..8a26037f1cf 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1198,15 +1198,14 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view,
 		obj = NULL;
 		(void)cfg_map_get(zoptions, "type", &obj);
 		INSIST(obj != NULL);
-		if (strcasecmp(cfg_obj_asstring(obj), "forward") != 0)
-			continue;
-
-		obj = NULL;
-		(void)cfg_map_get(zoptions, "forward", &obj);
-		if (obj == NULL)
-			continue;
-		if (strcasecmp(cfg_obj_asstring(obj), "only") != 0)
-			continue;
+		if (strcasecmp(cfg_obj_asstring(obj), "forward") == 0) {
+			obj = NULL;
+			(void)cfg_map_get(zoptions, "forward", &obj);
+			if (obj == NULL)
+				continue;
+			if (strcasecmp(cfg_obj_asstring(obj), "only") != 0)
+				continue;
+		}
 		if (db == NULL) {
 			CHECK(dns_db_create(view->mctx, "rbt", name,
 					    dns_dbtype_zone, view->rdclass,