diff --git a/CHANGES b/CHANGES index abb4099d8d..0648229a7f 100644 --- a/CHANGES +++ b/CHANGES @@ -126,7 +126,8 @@ 1541. [func] NSEC now uses new bitmap format. -1540. [placeholder] rt8934 +1540. [bug] "rndc reload " was silently accepted. + [RT #8934] 1539. [bug] Open UDP sockets for notify-source and transfer-source that use reserved ports at startup. [RT #9475] diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index 3f5799b0e7..95b5fa1074 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: result.h,v 1.101 2004/02/27 20:41:46 marka Exp $ */ +/* $Id: result.h,v 1.102 2004/03/02 02:37:11 marka Exp $ */ #ifndef DNS_RESULT_H #define DNS_RESULT_H 1 @@ -139,8 +139,9 @@ #define DNS_R_FROMWILDCARD (ISC_RESULTCLASS_DNS + 95) #define DNS_R_BADOWNERNAME (ISC_RESULTCLASS_DNS + 96) #define DNS_R_BADNAME (ISC_RESULTCLASS_DNS + 97) +#define DNS_R_DYNAMIC (ISC_RESULTCLASS_DNS + 98) -#define DNS_R_NRESULTS 98 /* Number of results */ +#define DNS_R_NRESULTS 99 /* Number of results */ /* * DNS wire format rcodes. diff --git a/lib/dns/result.c b/lib/dns/result.c index a84086f77b..4be095d697 100644 --- a/lib/dns/result.c +++ b/lib/dns/result.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: result.c,v 1.112 2004/02/27 20:41:44 marka Exp $ */ +/* $Id: result.c,v 1.113 2004/03/02 02:37:10 marka Exp $ */ #include @@ -146,7 +146,8 @@ static const char *text[DNS_R_NRESULTS] = { "from wildcard", /* 95 DNS_R_FROMWILDCARD */ "bad owner name (check-names)", /* 96 DNS_R_BADOWNERNAME */ - "bad name (check-names)" /* 97 DNS_R_BADNAME */ + "bad name (check-names)", /* 97 DNS_R_BADNAME */ + "dynamic zone" /* 98 DNS_R_DYNAMIC */ }; static const char *rcode_text[DNS_R_NRCODERESULTS] = { diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 410849ddf6..e04eac53d0 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.406 2004/03/02 01:19:51 marka Exp $ */ +/* $Id: zone.c,v 1.407 2004/03/02 02:37:11 marka Exp $ */ #include @@ -970,7 +970,10 @@ zone_load(dns_zone_t *zone, unsigned int flags) { * zone being reloaded. Do nothing - the database * we already have is guaranteed to be up-to-date. */ - result = ISC_R_SUCCESS; + if (zone->type == dns_zone_master) + result = DNS_R_DYNAMIC; + else + result = ISC_R_SUCCESS; goto cleanup; } diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 43bdf894da..7ba4a276a8 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zt.c,v 1.36 2004/02/03 00:59:05 marka Exp $ */ +/* $Id: zt.c,v 1.37 2004/03/02 02:37:11 marka Exp $ */ #include @@ -259,7 +259,8 @@ loadnew(dns_zone_t *zone, void *uap) { isc_result_t result; UNUSED(uap); result = dns_zone_loadnew(zone); - if (result == DNS_R_CONTINUE || result == DNS_R_UPTODATE) + if (result == DNS_R_CONTINUE || result == DNS_R_UPTODATE || + result == DNS_R_DYNAMIC) result = ISC_R_SUCCESS; return (result); }