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

use global max-transfer-time-out if per-zone option is not set

Browse Source
This commit is contained in:
Andreas Gustafsson
2000-01-31 23:13:22 +00:00
parent d405c0722d
commit 22eeba5ec6
2 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bin/named/zoneconf.c
View File

@@ -96,7 +96,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
isc_uint32_t i;
isc_sockaddr_t sockaddr;
isc_int32_t maxxfr;
isc_int32_t idle;
in_port_t port;
struct in_addr in4addr_any;
isc_sockaddr_t sockaddr_any4;
@@ -180,16 +179,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearnotify(zone);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimeout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrout(zone, maxxfr);
else
dns_zone_setmaxxfrout(zone, MAX_XFER_TIME);
result = dns_c_zone_getmaxtransidleout(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidleout(zone, idle);
else
dns_zone_setidleout(zone, 0);
result = dns_c_zone_getmaxtransidleout(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEOUT;
}
dns_zone_setidleout(zone, maxxfr);
break;
@@ -270,16 +273,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimeout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrout(zone, maxxfr);
else
dns_zone_setmaxxfrout(zone, MAX_XFER_TIME);
result = dns_c_zone_getmaxtransidleout(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidleout(zone, idle);
else
dns_zone_setidleout(zone, 0);
result = dns_c_zone_getmaxtransidleout(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEOUT;
}
dns_zone_setidleout(zone, maxxfr);
break;

41
lib/dns/zoneconf.c
View File

@@ -96,7 +96,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
isc_uint32_t i;
isc_sockaddr_t sockaddr;
isc_int32_t maxxfr;
isc_int32_t idle;
in_port_t port;
struct in_addr in4addr_any;
isc_sockaddr_t sockaddr_any4;
@@ -180,16 +179,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearnotify(zone);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimeout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrout(zone, maxxfr);
else
dns_zone_setmaxxfrout(zone, MAX_XFER_TIME);
result = dns_c_zone_getmaxtransidleout(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidleout(zone, idle);
else
dns_zone_setidleout(zone, 0);
result = dns_c_zone_getmaxtransidleout(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEOUT;
}
dns_zone_setidleout(zone, maxxfr);
break;
@@ -270,16 +273,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimeout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrout(zone, maxxfr);
else
dns_zone_setmaxxfrout(zone, MAX_XFER_TIME);
result = dns_c_zone_getmaxtransidleout(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidleout(zone, idle);
else
dns_zone_setidleout(zone, 0);
result = dns_c_zone_getmaxtransidleout(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr);
if (result != DNS_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEOUT;
}
dns_zone_setidleout(zone, maxxfr);
break;