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

2591. [bug] named could die when processing a update in

Browse Source 
removed_orphaned_ds(). [RT #19507]
This commit is contained in:
Mark Andrews
2009-04-30 06:59:11 +00:00
parent b770eae51e
commit 47323be2af
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2591. [bug] named could die when processing a update in
removed_orphaned_ds(). [RT #19507]
2590. [func] Report zone/class of "update with no effect".
[RT #19542]

40
bin/named/update.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update.c,v 1.156 2009/03/18 22:17:24 jinmei Exp $ */
/* $Id: update.c,v 1.157 2009/04/30 06:59:11 marka Exp $ */
#include <config.h>
@@ -2773,26 +2773,36 @@ static isc_result_t
remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) {
isc_result_t result;
isc_boolean_t ns_exists;
dns_difftuple_t *t;
dns_difftuple_t *tupple;
dns_diff_t temp_diff;
for (t = ISC_LIST_HEAD(diff->tuples);
t != NULL;
t = ISC_LIST_NEXT(t, link)) {
if (!((t->op == DNS_DIFFOP_DEL &&
t->rdata.type == dns_rdatatype_ns) ||
(t->op == DNS_DIFFOP_ADD &&
t->rdata.type == dns_rdatatype_ds)))
dns_diff_init(diff->mctx, &temp_diff);
for (tupple = ISC_LIST_HEAD(diff->tuples);
tupple != NULL;
tupple = ISC_LIST_NEXT(tupple, link)) {
if (!((tupple->op == DNS_DIFFOP_DEL &&
tupple->rdata.type == dns_rdatatype_ns) ||
(tupple->op == DNS_DIFFOP_ADD &&
tupple->rdata.type == dns_rdatatype_ds)))
continue;
CHECK(rrset_exists(db, newver, &t->name, dns_rdatatype_ns, 0,
&ns_exists));
if (ns_exists && !dns_name_equal(&t->name, dns_db_origin(db)))
CHECK(rrset_exists(db, newver, &tupple->name,
dns_rdatatype_ns, 0, &ns_exists));
if (ns_exists &&
!dns_name_equal(&tupple->name, dns_db_origin(db)))
continue;
CHECK(delete_if(true_p, db, newver, &t->name,
dns_rdatatype_ds, 0, NULL, diff));
CHECK(delete_if(true_p, db, newver, &tupple->name,
dns_rdatatype_ds, 0, NULL, &temp_diff));
}
return (ISC_R_SUCCESS);
result = ISC_R_SUCCESS;
failure:
for (tupple = ISC_LIST_HEAD(temp_diff.tuples);
tupple != NULL;
tupple = ISC_LIST_HEAD(temp_diff.tuples)) {
ISC_LIST_UNLINK(temp_diff.tuples, tupple, link);
dns_diff_appendminimal(diff, &tupple);
}
return (result);
}