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 8a13b5997d608bb8efc0142c0ccac3286853c789..81d8b4feb8dd230b9c6f56396528d007632cefd0 100644 (file)
--- 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 02f859038756350f52c1a2b0f931ce55c61db651..8a26037f1cfe6827a4aeeb9e55baf982bbc15633 100644 (file)
--- 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,