pullup:

1045.   [bug]           It was possible to skip saving glue for a nameserver
                        for a stub zone.

diff --git a/CHANGES b/CHANGES
index b7ff9a078984cc5d9f29fc4df0675a70236e0a02..e280ce0308b25a4319bf2207e81cd8b9523e2f08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1045.  [bug]           It was possible to skip saving glue for a nameserver
+                       for a stub zone.
+
 1044.  [bug]           Specifying allow-transfer, notify-source, or
                        notify-source-v6 in a stub zone was not treated
                        as an error.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f126fe25886989365ef0e86d8d2859bb32fcfada..6f21c7c40980c8bcedb911714fb456beeb59450e 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.2 2001/09/05 00:38:01 gson Exp $ */
+/* $Id: zone.c,v 1.333.2.3 2001/10/11 17:20:40 gson Exp $ */
 
 #include <config.h>
 
@@ -2816,10 +2816,8 @@ save_nsrrset(dns_message_t *message, dns_name_t *name,
                result = dns_rdata_tostruct(&rdata, &ns, NULL);
                dns_rdata_reset(&rdata);
                RUNTIME_CHECK(result == ISC_R_SUCCESS);
-               if (!dns_name_issubdomain(&ns.name, name)) {
-                       result = dns_rdataset_next(nsrdataset);
+               if (!dns_name_issubdomain(&ns.name, name))
                        continue;
-               }
                rdataset = NULL;
                result = dns_message_findname(message, DNS_SECTION_ADDITIONAL,
                                              &ns.name, dns_rdatatype_a6,