pullup:

 772.   [bug]           Owner names could be incorrectly omitted from cache
                        dumps in the presence of negative caching entries.
                        [RT #991]

diff --git a/CHANGES b/CHANGES
index b5c558a9bff4247fb63aaf0e52dc5c328c7d9952..1f6f9bc1b62eaceb15711676a2208a6da17827ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+ 772.  [bug]           Owner names could be incorrectly omitted from cache
+                       dumps in the presence of negative caching entries.
+                       [RT #991]
+
        --- 9.1.1rc4 released ---
 
  767.  [bug]           The configuration parser handled invalid ports badly.

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index f3817b137445d589b96097039ee74d975bb9c93e..555abcb98814c5a07f9f20dbf0132e554a6c997a 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.38.2.2 2001/01/16 22:30:55 bwelling Exp $ */
+/* $Id: masterdump.c,v 1.38.2.3 2001/03/07 23:33:18 bwelling Exp $ */
 
 #include <config.h>
 
@@ -733,10 +733,10 @@ dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter,
                                               buffer, f);
                        if (result != ISC_R_SUCCESS)
                                dumpresult = result;
+                       if ((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != 0)
+                               name = NULL;
                }
                dns_rdataset_disassociate(sorted[i]);
-               if ((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != 0)
-                       name = NULL;
        }
 
        if (dumpresult != ISC_R_SUCCESS)