From 90bb4070d9482a6d2bf880e378fb065352ea1b05 Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Wed, 7 Mar 2001 23:33:18 +0000 Subject: [PATCH] pullup: 772. [bug] Owner names could be incorrectly omitted from cache dumps in the presence of negative caching entries. [RT #991] --- CHANGES | 4 ++++ lib/dns/masterdump.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b5c558a9bff..1f6f9bc1b62 100644 --- 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 f3817b13744..555abcb9881 100644 --- 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 @@ -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) -- 2.47.3