upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 07:12:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not force replacement mode for singleton types

Browse source
This commit is contained in:
Bob Halley 2000-11-22 01:56:02 +00:00
parent bab57cc87f
commit d5c1fec74c
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/dns/rbtdb.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rbtdb.c,v 1.133 2000/11/22 00:18:33 halley Exp $ */
/* $Id: rbtdb.c,v 1.134 2000/11/22 01:56:02 halley Exp $ */
/*
* Principal Author: Bob Halley
@ -3264,24 +3264,10 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
}
/*
* Turn off merging in certain cases.
* Don't merge if a nonexistent rdataset is involved.
*/
if (merge) {
if (header_nx || newheader_nx) {
/*
* Don't merge if a nonexistent rdataset is
* involved.
*/
merge = ISC_FALSE;
} else {
/*
* Do not merge singleton types.
*/
rdtype = RBTDB_RDATATYPE_BASE(newheader->type);
if (dns_rdatatype_issingleton(rdtype))
merge = ISC_FALSE;
}
}
if (merge && (header_nx || newheader_nx))
merge = ISC_FALSE;
/*
* If 'merge' is ISC_TRUE, we'll try to create a new rdataset