mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

dns_zone_configure() does not need to special-case hint zones,

Browse Source 
because it must never be called for them
This commit is contained in:
Andreas Gustafsson
2000-11-11 01:05:43 +00:00
parent c2f4fe7f95
commit dcd12febbd
2 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bin/named/zoneconf.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.67 2000/11/07 23:49:29 mws Exp $ */
/* $Id: zoneconf.c,v 1.68 2000/11/11 01:05:43 gson Exp $ */
#include <config.h>
@@ -241,30 +241,26 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
dns_zone_setqueryacl,
dns_zone_clearqueryacl));
if (czone->ztype != dns_c_zone_hint) {
result = dns_c_zone_getdialup(czone, &dialup);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getdialup(cview, &dialup);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getdialup(cctx, &dialup);
if (result != ISC_R_SUCCESS)
dialup = dns_dialuptype_no;
dns_zone_setdialup(zone, dialup);
}
result = dns_c_zone_getdialup(czone, &dialup);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getdialup(cview, &dialup);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getdialup(cctx, &dialup);
if (result != ISC_R_SUCCESS)
dialup = dns_dialuptype_no;
dns_zone_setdialup(zone, dialup);
if (czone->ztype != dns_c_zone_hint) {
result = dns_c_zone_getstatistics(czone, &statistics);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getstatistics(cview, &statistics);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getstatistics(cctx, &statistics);
if (result != ISC_R_SUCCESS)
statistics = ISC_FALSE;
if (statistics)
dns_zone_startcounting(zone);
else
dns_zone_stopcounting(zone);
}
result = dns_c_zone_getstatistics(czone, &statistics);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getstatistics(cview, &statistics);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getstatistics(cctx, &statistics);
if (result != ISC_R_SUCCESS)
statistics = ISC_FALSE;
if (statistics)
dns_zone_startcounting(zone);
else
dns_zone_stopcounting(zone);
#ifndef NOMINUM_PUBLIC
if (czone->ztype != dns_c_zone_stub) {

44
lib/dns/zoneconf.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.67 2000/11/07 23:49:29 mws Exp $ */
/* $Id: zoneconf.c,v 1.68 2000/11/11 01:05:43 gson Exp $ */
#include <config.h>
@@ -241,30 +241,26 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
dns_zone_setqueryacl,
dns_zone_clearqueryacl));
if (czone->ztype != dns_c_zone_hint) {
result = dns_c_zone_getdialup(czone, &dialup);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getdialup(cview, &dialup);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getdialup(cctx, &dialup);
if (result != ISC_R_SUCCESS)
dialup = dns_dialuptype_no;
dns_zone_setdialup(zone, dialup);
}
result = dns_c_zone_getdialup(czone, &dialup);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getdialup(cview, &dialup);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getdialup(cctx, &dialup);
if (result != ISC_R_SUCCESS)
dialup = dns_dialuptype_no;
dns_zone_setdialup(zone, dialup);
if (czone->ztype != dns_c_zone_hint) {
result = dns_c_zone_getstatistics(czone, &statistics);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getstatistics(cview, &statistics);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getstatistics(cctx, &statistics);
if (result != ISC_R_SUCCESS)
statistics = ISC_FALSE;
if (statistics)
dns_zone_startcounting(zone);
else
dns_zone_stopcounting(zone);
}
result = dns_c_zone_getstatistics(czone, &statistics);
if (result != ISC_R_SUCCESS && cview != NULL)
result = dns_c_view_getstatistics(cview, &statistics);
if (result != ISC_R_SUCCESS)
result = dns_c_ctx_getstatistics(cctx, &statistics);
if (result != ISC_R_SUCCESS)
statistics = ISC_FALSE;
if (statistics)
dns_zone_startcounting(zone);
else
dns_zone_stopcounting(zone);
#ifndef NOMINUM_PUBLIC
if (czone->ztype != dns_c_zone_stub) {