mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

pull down rt3507 (work by Mark, checked by me)

Browse Source
This commit is contained in:
Michael Graff
2002-11-12 21:52:44 +00:00
parent 474ec6ef33
commit 4411b9b6e7
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/dnssec/dnssec-signzone.c
View File

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.163 2002/11/04 00:16:05 marka Exp $ */
/* $Id: dnssec-signzone.c,v 1.164 2002/11/12 21:52:43 explorer Exp $ */
#include <config.h>
@@ -786,12 +786,18 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
/*
* If this name is a delegation point, skip all records
* except NXT and DS sets.
* except NXT and DS sets. Otherwise check that there
* isn't a DS record.
*/
if (isdelegation) {
if (rdataset.type != dns_rdatatype_nxt &&
rdataset.type != dns_rdatatype_ds)
goto skip;
} else if (rdataset.type == dns_rdatatype_ds) {
char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(name, namebuf, sizeof(namebuf));
fatal("'%s': found DS RRset without NS RRset\n",
namebuf);
}
if (rdataset.type == dns_rdatatype_nxt) {

33
bin/named/update.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update.c,v 1.102 2002/11/12 20:16:30 marka Exp $ */
/* $Id: update.c,v 1.103 2002/11/12 21:52:44 explorer Exp $ */
#include <config.h>
@@ -2043,6 +2043,35 @@ ns_update_start(ns_client_t *client, isc_result_t sigresult) {
dns_zone_detach(&zone);
}
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, ds_exists;
dns_difftuple_t *t;
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)
continue;
CHECK(rrset_exists(db, newver, &t->name, dns_rdatatype_ns, 0,
&ns_exists));
if (ns_exists)
continue;
CHECK(rrset_exists(db, newver, &t->name, dns_rdatatype_ds, 0,
&ds_exists));
if (!ds_exists)
continue;
CHECK(delete_if(true_p, db, newver, &t->name,
dns_rdatatype_ds, 0, NULL, diff));
}
return (ISC_R_SUCCESS);
failure:
return (result);
}
static void
update_action(isc_task_t *task, isc_event_t *event) {
update_event_t *uev = (update_event_t *) event;
@@ -2525,6 +2554,8 @@ update_action(isc_task_t *task, isc_event_t *event) {
CHECK(increment_soa_serial(db, ver, &diff, mctx));
}
CHECK(remove_orphaned_ds(db, ver, &diff));
if (dns_db_issecure(db)) {
result = update_signatures(client, zone, db, oldver,
ver, &diff,