mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

1753. [bug] Don't serve a slave zone which has no NS records.

Browse Source 
[RT #12894]
This commit is contained in:
Mark Andrews
2004-10-26 02:01:19 +00:00
parent 40e7c805a8
commit e743a2b3b7
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
1753. [bug] Don't serve a slave zone which has no NS records.
[RT #12894]
1752. [port] Move isc_app_start() to after ns_os_daemonise() 1752. [port] Move isc_app_start() to after ns_os_daemonise()
as some fork() implementations unblock the signals as some fork() implementations unblock the signals
that are blocked by isc_app_start(). [RT #12810] that are blocked by isc_app_start(). [RT #12810]

9
lib/dns/include/dns/zone.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.h,v 1.126 2004/03/05 05:09:47 marka Exp $ */ /* $Id: zone.h,v 1.127 2004/10/26 02:01:19 marka Exp $ */
#ifndef DNS_ZONE_H #ifndef DNS_ZONE_H
#define DNS_ZONE_H 1 #define DNS_ZONE_H 1
@@ -971,6 +971,13 @@ dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump);
* *
* Requires: * Requires:
* 'zone' to be a valid zone. * 'zone' to be a valid zone.
*
* Returns:
* DNS_R_SUCCESS
* DNS_R_BADZONE zone failed basic consistancy checks:
* * a single SOA must exist
* * some NS records must exist.
* Others
*/ */
isc_uint32_t isc_uint32_t

34
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.421 2004/10/06 05:56:29 marka Exp $ */ /* $Id: zone.c,v 1.422 2004/10/26 02:01:19 marka Exp $ */
#include <config.h> #include <config.h>
@@ -2200,7 +2200,6 @@ zone_expire(dns_zone_t *zone) {
zone->refresh = DNS_ZONE_DEFAULTREFRESH; zone->refresh = DNS_ZONE_DEFAULTREFRESH;
zone->retry = DNS_ZONE_DEFAULTRETRY; zone->retry = DNS_ZONE_DEFAULTRETRY;
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HAVETIMERS); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDDUMP);
zone_unload(zone); zone_unload(zone);
} }
@@ -2555,6 +2554,7 @@ zone_unload(dns_zone_t *zone) {
dns_db_detach(&zone->db); dns_db_detach(&zone->db);
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADED); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADED);
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDDUMP);
} }
void void
@@ -5213,6 +5213,8 @@ static isc_result_t
zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
dns_dbversion_t *ver; dns_dbversion_t *ver;
isc_result_t result; isc_result_t result;
unsigned int soacount = 0;
unsigned int nscount = 0;
/* /*
* 'zone' locked by caller. * 'zone' locked by caller.
@@ -5220,6 +5222,22 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(LOCKED_ZONE(zone)); REQUIRE(LOCKED_ZONE(zone));
result = zone_get_from_db(db, &zone->origin, &nscount, &soacount,
NULL, NULL, NULL, NULL, NULL);
if (result == ISC_R_SUCCESS) {
if (soacount != 1) {
dns_zone_log(zone, ISC_LOG_ERROR,
"has %d SOA records", soacount);
result = DNS_R_BADZONE;
}
if (nscount == 0) {
dns_zone_log(zone, ISC_LOG_ERROR, "has no NS records");
result = DNS_R_BADZONE;
}
}
if (result != ISC_R_SUCCESS)
return (result);
ver = NULL; ver = NULL;
dns_db_currentversion(db, &ver); dns_db_currentversion(db, &ver);
@@ -5369,10 +5387,19 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
"transferred zone " "transferred zone "
"has %d SOA record%s", soacount, "has %d SOA record%s", soacount,
(soacount != 0) ? "s" : ""); (soacount != 0) ? "s" : "");
if (nscount == 0) if (nscount == 0) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"transferred zone " "transferred zone "
"has no NS records"); "has no NS records");
if (DNS_ZONE_FLAG(zone,
DNS_ZONEFLG_HAVETIMERS)) {
zone->refresh = DNS_ZONE_DEFAULTREFRESH;
zone->retry = DNS_ZONE_DEFAULTRETRY;
}
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
zone_unload(zone);
goto next_master;
}
zone->serial = serial; zone->serial = serial;
zone->refresh = RANGE(refresh, zone->minrefresh, zone->refresh = RANGE(refresh, zone->minrefresh,
zone->maxrefresh); zone->maxrefresh);
@@ -5447,6 +5474,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
goto same_master; goto same_master;
default: default:
next_master:
zone->curmaster++; zone->curmaster++;
same_master: same_master:
if (zone->curmaster >= zone->masterscnt) { if (zone->curmaster >= zone->masterscnt) {