diff options
| author | dougb <dougb@FreeBSD.org> | 2012-04-05 04:29:35 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2012-04-05 04:29:35 +0000 |
| commit | 0adb91c0ac8b4cb02cf5b6c0214cfbaed14c3ca7 (patch) | |
| tree | cf3176c0801c94a4f298353cc450f10cf1aae9c0 /contrib/bind9/lib/dns/masterdump.c | |
| parent | cc55f4943b841b3772901d62a327ad4f9edb2c95 (diff) | |
| download | FreeBSD-src-0adb91c0ac8b4cb02cf5b6c0214cfbaed14c3ca7.zip FreeBSD-src-0adb91c0ac8b4cb02cf5b6c0214cfbaed14c3ca7.tar.gz | |
Update to version 9.8.2, the latest from ISC, which contains numerous bug fixes.
Diffstat (limited to 'contrib/bind9/lib/dns/masterdump.c')
| -rw-r--r-- | contrib/bind9/lib/dns/masterdump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bind9/lib/dns/masterdump.c b/contrib/bind9/lib/dns/masterdump.c index c137b10..0c17c1a 100644 --- a/contrib/bind9/lib/dns/masterdump.c +++ b/contrib/bind9/lib/dns/masterdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.99.258.7 2011-06-08 23:02:42 each Exp $ */ +/* $Id$ */ /*! \file */ @@ -416,12 +416,11 @@ rdataset_totext(dns_rdataset_t *rdataset, rdataset->attributes |= DNS_RDATASETATTR_LOADORDER; result = dns_rdataset_first(rdataset); - REQUIRE(result == ISC_R_SUCCESS); current_ttl = ctx->current_ttl; current_ttl_valid = ctx->current_ttl_valid; - do { + while (result == ISC_R_SUCCESS) { column = 0; /* @@ -546,7 +545,7 @@ rdataset_totext(dns_rdataset_t *rdataset, first = ISC_FALSE; result = dns_rdataset_next(rdataset); - } while (result == ISC_R_SUCCESS); + } if (result != ISC_R_NOMORE) return (result); @@ -928,6 +927,7 @@ dump_rdataset_raw(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, REQUIRE(buffer->length > 0); REQUIRE(DNS_RDATASET_VALID(rdataset)); + rdataset->attributes |= DNS_RDATASETATTR_LOADORDER; restart: totallen = 0; result = dns_rdataset_first(rdataset); |
