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

In join_nodes, when using the space of the down node, it needs to get

Browse Source 
the attributes of the joined name to correctly identify whether it
is absolute.  (IE, when the first level is joined with the top level,
the node struct being used is from the first level, which is not
absolute, but the new name is absolute so the struct needs to be updated.)
This commit is contained in:
David Lawrence
1999-05-07 12:13:25 +00:00
parent 94a3bcd132
commit bee0bb2b68
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dns/rbt.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rbt.c,v 1.52 1999/05/07 02:47:35 tale Exp $ */
/* $Id: rbt.c,v 1.53 1999/05/07 12:13:25 tale Exp $ */
/* Principal Authors: DCL */
@@ -1292,7 +1292,7 @@ join_nodes(dns_rbt_t *rbt,
*/
newlength = newname->length + newname->labels;
oldlength = NAMELEN(down) + OFFSETLEN(down);
if (newlength >= oldlength + PADBYTES(down))
if (newlength > oldlength + PADBYTES(down))
result = create_node(rbt->mctx, newname, &newnode);
else {
@@ -1302,6 +1302,8 @@ join_nodes(dns_rbt_t *rbt,
OFFSETLEN(down) = newname->labels;
memcpy(OFFSETS(down), newname->offsets, newname->labels);
ATTRS(down) = newname->attributes;
newnode = down;
result = DNS_R_SUCCESS;
}
@@ -1328,12 +1330,8 @@ join_nodes(dns_rbt_t *rbt,
isc_mem_put(rbt->mctx, node, NODE_SIZE(node));
if (newnode != down) {
if (newnode != down)
isc_mem_put(rbt->mctx, down, NODE_SIZE(down));
#if 0
isc_mem_put(rbt->mctx, r.base, r.length);
#endif
}
}
return (result);