pullup misc. changes

This commit is contained in:
Mark Andrews
2003-08-25 05:49:57 +00:00
parent 5874ad9039
commit 388672fb80
5 changed files with 16 additions and 23 deletions
+7 -1
View File
@@ -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 <config.h>
@@ -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;
+1 -10
View File
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.18 2003/08/25 04:16:21 marka Exp $ -->
<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.19 2003/08/25 05:49:55 marka Exp $ -->
<book>
<title>BIND 9 Administrator Reference Manual</title>
@@ -6064,15 +6064,6 @@ Conformant Global Address Mapping</title>
<title>Common <acronym>DNS</acronym> Operational and Configuration Errors</title>
<pubdate>February 1996</pubdate>
</biblioentry>
<biblioentry>
<abbrev>RFC1912</abbrev>
<author>
<surname>Barr</surname>
<firstname>D.</firstname>
</author>
<title>Common <acronym>DNS</acronym> Operational and Configuration Errors</title>
<pubdate>February 1996</pubdate>
</biblioentry>
<biblioentry>
<abbrev>RFC2010</abbrev>
<authorgroup>
+3 -2
View File
@@ -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
+1 -9
View File
@@ -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 <config.h>
@@ -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);
+4 -1
View File
@@ -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 <config.h>
@@ -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)) {