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

1623. [bug] A serial number of zero was being displayed in the

Browse Source 
"sending notifies" log message when also-notify was
                        used. [RT #11177]
This commit is contained in:
Mark Andrews 2004-04-28 04:23:24 +00:00
parent 3dc3d557be
commit 08b40678f3
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,4 +1,6 @@
1623. [placeholder] rt11177 1623. [bug] A serial number of zero was being displayed in the
"sending notifies" log message when also-notify was
used. [RT #11177]
1622. [placeholder] rt11156 1622. [placeholder] rt11156

96
lib/dns/zone.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.412 2004/04/28 04:07:28 marka Exp $ */ /* $Id: zone.c,v 1.413 2004/04/28 04:23:24 marka Exp $ */
#include <config.h> #include <config.h>
@ -2893,7 +2893,7 @@ zone_notify(dns_zone_t *zone) {
dns_name_t master; dns_name_t master;
dns_rdata_ns_t ns; dns_rdata_ns_t ns;
dns_rdata_soa_t soa; dns_rdata_soa_t soa;
isc_uint32_t serial = 0; isc_uint32_t serial;
dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdataset_t nsrdset; dns_rdataset_t nsrdset;
dns_rdataset_t soardset; dns_rdataset_t soardset;
@ -2933,44 +2933,8 @@ zone_notify(dns_zone_t *zone) {
flags |= DNS_NOTIFY_NOSOA; flags |= DNS_NOTIFY_NOSOA;
/* /*
* Enqueue notify requests for 'also-notify' servers. * Get SOA RRset.
*/ */
LOCK_ZONE(zone);
for (i = 0; i < zone->notifycnt; i++) {
dst = zone->notify[i];
if (notify_isqueued(zone, NULL, &dst))
continue;
result = notify_create(zone->mctx, flags, &notify);
if (result != ISC_R_SUCCESS) {
UNLOCK_ZONE(zone);
return;
}
zone_iattach(zone, &notify->zone);
notify->dst = dst;
ISC_LIST_APPEND(zone->notifies, notify, link);
result = notify_send_queue(notify);
if (result != ISC_R_SUCCESS) {
notify_destroy(notify, ISC_TRUE);
UNLOCK_ZONE(zone);
return;
}
if (!loggednotify) {
notify_log(zone, ISC_LOG_INFO,
"sending notifies (serial %u)",
serial);
loggednotify = ISC_TRUE;
}
notify = NULL;
}
UNLOCK_ZONE(zone);
if (notifytype == dns_notifytype_explicit)
return;
/*
* Process NS RRset to generate notifies.
*/
dns_db_currentversion(zone->db, &version); dns_db_currentversion(zone->db, &version);
result = dns_db_findnode(zone->db, origin, ISC_FALSE, &node); result = dns_db_findnode(zone->db, origin, ISC_FALSE, &node);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
@ -2984,21 +2948,55 @@ zone_notify(dns_zone_t *zone) {
goto cleanup2; goto cleanup2;
/* /*
* Find master server's name. * Find serial and master server's name.
*/ */
dns_name_init(&master, NULL); dns_name_init(&master, NULL);
result = dns_rdataset_first(&soardset); result = dns_rdataset_first(&soardset);
if (result == ISC_R_SUCCESS) {
dns_rdataset_current(&soardset, &rdata);
result = dns_rdata_tostruct(&rdata, &soa, NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
dns_rdata_reset(&rdata);
result = dns_name_dup(&soa.origin, zone->mctx, &master);
serial = soa.serial;
dns_rdataset_disassociate(&soardset);
}
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup3; goto cleanup3;
dns_rdataset_current(&soardset, &rdata);
result = dns_rdata_tostruct(&rdata, &soa, NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
dns_rdata_reset(&rdata);
result = dns_name_dup(&soa.origin, zone->mctx, &master);
serial = soa.serial;
dns_rdataset_disassociate(&soardset);
if (result != ISC_R_SUCCESS)
goto cleanup3;
/*
* Enqueue notify requests for 'also-notify' servers.
*/
LOCK_ZONE(zone);
for (i = 0; i < zone->notifycnt; i++) {
dst = zone->notify[i];
if (notify_isqueued(zone, NULL, &dst))
continue;
result = notify_create(zone->mctx, flags, &notify);
if (result != ISC_R_SUCCESS)
continue;
zone_iattach(zone, &notify->zone);
notify->dst = dst;
ISC_LIST_APPEND(zone->notifies, notify, link);
result = notify_send_queue(notify);
if (result != ISC_R_SUCCESS)
notify_destroy(notify, ISC_TRUE);
if (!loggednotify) {
notify_log(zone, ISC_LOG_INFO,
"sending notifies (serial %u)",
serial);
loggednotify = ISC_TRUE;
}
notify = NULL;
}
UNLOCK_ZONE(zone);
if (notifytype == dns_notifytype_explicit)
goto cleanup3;
/*
* Process NS RRset to generate notifies.
*/
dns_rdataset_init(&nsrdset); dns_rdataset_init(&nsrdset);
result = dns_db_findrdataset(zone->db, node, version, result = dns_db_findrdataset(zone->db, node, version,