ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Move dns_trust_totext() to rdataset.c so exportlibs will build. (This

Browse Source 
change was accidentally omitted from 9.8.0-P2.  I'm committing it to
the patch branch now so we won't have to remember it if we ever
release -P3.)
This commit is contained in:
Evan Hunt
2011-06-02 20:08:01 +00:00
parent b5653e8568
commit 82c2a7fe09
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/dns/include/dns/masterdump.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.h,v 1.42 2008/09/24 02:46:23 marka Exp $ */
/* $Id: masterdump.h,v 1.42.596.1 2011/06/02 20:08:01 each Exp $ */
#ifndef DNS_MASTERDUMP_H
#define DNS_MASTERDUMP_H 1
@@ -332,9 +332,6 @@ dns_master_stylecreate(dns_master_style_t **style, unsigned int flags,
void
dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx);
const char *
dns_trust_totext(dns_trust_t trust);
ISC_LANG_ENDDECLS
#endif /* DNS_MASTERDUMP_H */

8
lib/dns/include/dns/rdataset.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdataset.h,v 1.69 2010/02/25 05:08:01 tbox Exp $ */
/* $Id: rdataset.h,v 1.69.270.1 2011/06/02 20:08:01 each Exp $ */
#ifndef DNS_RDATASET_H
#define DNS_RDATASET_H 1
@@ -650,6 +650,12 @@ dns_rdataset_expire(dns_rdataset_t *rdataset);
* Mark the rdataset to be expired in the backing database.
*/
const char *
dns_trust_totext(dns_trust_t trust);
/*%<
* Display trust in textual form.
*/
ISC_LANG_ENDDECLS
#endif /* DNS_RDATASET_H */

27
lib/dns/masterdump.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.99 2009/11/17 23:55:18 marka Exp $ */
/* $Id: masterdump.c,v 1.99.328.1 2011/06/02 20:08:01 each Exp $ */
/*! \file */
@@ -835,26 +835,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,
@@ -894,10 +874,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) {

22
lib/dns/rdataset.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdataset.c,v 1.86 2010/02/25 05:08:01 tbox Exp $ */
/* $Id: rdataset.c,v 1.86.220.1 2011/06/02 20:08:01 each Exp $ */
/*! \file */
@@ -34,6 +34,26 @@
#include <dns/rdataset.h>
#include <dns/compress.h>
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]);
}
void
dns_rdataset_init(dns_rdataset_t *rdataset) {