diff options
author | dougb <dougb@FreeBSD.org> | 2011-05-27 23:50:10 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2011-05-27 23:50:10 +0000 |
commit | 844f19b0edf02767283e90275c49bb59f15b5aac (patch) | |
tree | 3da3a204d3c1cb34210519d40feaea44a3a7f04c /lib/dns/masterdump.c | |
parent | 8287cb3f73a2d36684fdf69f4009f28e17dd3800 (diff) | |
download | FreeBSD-src-844f19b0edf02767283e90275c49bb59f15b5aac.zip FreeBSD-src-844f19b0edf02767283e90275c49bb59f15b5aac.tar.gz |
Vendor import of BIND 9.6-ESV-R4-P1
Diffstat (limited to 'lib/dns/masterdump.c')
-rw-r--r-- | lib/dns/masterdump.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 314112c..34c984b 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.94.50.3 2009/11/18 00:15:37 marka Exp $ */ +/* $Id: masterdump.c,v 1.94.50.3.18.1 2011-05-27 00:19:19 each Exp $ */ /*! \file */ @@ -773,26 +773,6 @@ dump_order_compare(const void *a, const void *b) { #define MAXSORT 64 -static const char *trustnames[] = { - "none", - "pending-additional", - "pending-answer", - "additional", - "glue", - "answer", - "authauthority", - "authanswer", - "secure", - "local" /* aka ultimate */ -}; - -const char * -dns_trust_totext(dns_trust_t trust) { - if (trust >= sizeof(trustnames)/sizeof(*trustnames)) - return ("bad"); - return (trustnames[trust]); -} - static isc_result_t dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, @@ -832,10 +812,7 @@ dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name, for (i = 0; i < n; i++) { dns_rdataset_t *rds = sorted[i]; if (ctx->style.flags & DNS_STYLEFLAG_TRUST) { - unsigned int trust = rds->trust; - INSIST(trust < (sizeof(trustnames) / - sizeof(trustnames[0]))); - fprintf(f, "; %s\n", trustnames[trust]); + fprintf(f, "; %s\n", dns_trust_totext(rds->trust)); } if (rds->type == 0 && (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) { |