From 388672fb80d73add15a3e1b7130bbde55e7cc67e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 25 Aug 2003 05:49:57 +0000 Subject: [PATCH] pullup misc. changes --- bin/named/update.c | 8 +++++++- doc/arm/Bv9ARM-book.xml | 11 +---------- lib/dns/include/dns/rbt.h | 5 +++-- lib/dns/name.c | 10 +--------- lib/dns/resolver.c | 5 ++++- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/bin/named/update.c b/bin/named/update.c index 621d0086c0..af1d6cc659 100644 --- a/bin/named/update.c +++ b/bin/named/update.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.88.2.5.2.8 2003/08/15 02:21:02 marka Exp $ */ +/* $Id: update.c,v 1.88.2.5.2.9 2003/08/25 05:49:54 marka Exp $ */ #include @@ -1925,6 +1925,12 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, * the RFC2136 pseudocode as closely as possible. */ +/* + * DS records are not allowed to exist without corresponding NS records, + * draft-ietf-dnsext-delegation-signer-11.txt, 2.2 Protocol Change, + * "DS RRsets MUST NOT appear at non-delegation points or at a zone's apex". + */ + static isc_result_t send_update_event(ns_client_t *client, dns_zone_t *zone) { isc_result_t result = ISC_R_SUCCESS; diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 4200c7682b..95513ceac7 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -2,7 +2,7 @@ - + BIND 9 Administrator Reference Manual @@ -6064,15 +6064,6 @@ Conformant Global Address Mapping Common <acronym>DNS</acronym> Operational and Configuration Errors February 1996 - - RFC1912 - - Barr - D. - - Common <acronym>DNS</acronym> Operational and Configuration Errors - February 1996 - RFC2010 diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index b0b7af3142..7dad41ed02 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbt.h,v 1.55 2001/06/01 03:07:54 halley Exp $ */ +/* $Id: rbt.h,v 1.55.12.1 2003/08/25 05:49:57 marka Exp $ */ #ifndef DNS_RBT_H #define DNS_RBT_H 1 @@ -137,7 +137,8 @@ typedef isc_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node, * definition of "@" as the current origin. * * dns_rbtnodechain_current is similar to the _first, _last, _prev and _next - * functions but additionally can provide the node to which the chain points. */ + * functions but additionally can provide the node to which the chain points. + */ /* * The number of level blocks to allocate at a time. Currently the maximum diff --git a/lib/dns/name.c b/lib/dns/name.c index c8948fdda2..7148cd3043 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.c,v 1.127.2.7.2.2 2003/08/20 05:33:16 marka Exp $ */ +/* $Id: name.c,v 1.127.2.7.2.3 2003/08/25 05:49:56 marka Exp $ */ #include @@ -1830,7 +1830,6 @@ dns_name_split(dns_name_t *name, dns_offsets_t name_odata; unsigned char *offsets; unsigned int splitlabel; - unsigned char *p; REQUIRE(nbits == 0); /* no bitstring support */ REQUIRE(VALID_NAME(name)); @@ -1850,13 +1849,6 @@ dns_name_split(dns_name_t *name, splitlabel = name->labels - suffixlabels; - /* - * Make p point at the count byte of the bitstring label, - * if there is one (p will not be used if we are not - * splitting bits). - */ - p = &name->ndata[offsets[splitlabel] + 1]; - if (prefix != NULL) dns_name_getlabelsequence(name, 0, splitlabel, prefix); diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 62271f0920..fa58034a53 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.14 2003/08/25 04:16:23 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.15 2003/08/25 05:49:56 marka Exp $ */ #include @@ -3572,6 +3572,9 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname, name = NULL; dns_message_currentname(message, section, &name); if (dns_name_issubdomain(name, &fctx->domain)) { + /* + * Look for NS RRset first. + */ for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; rdataset = ISC_LIST_NEXT(rdataset, link)) {