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

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

Browse Source
This commit is contained in:
Andreas Gustafsson
2000-01-31 19:53:14 +00:00
parent d95e6b2631
commit bb56f556f5
2 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
bin/named/zoneconf.c
View File

@@ -29,6 +29,8 @@
/* XXX copied from zone.c */
#define MAX_XFER_TIME (2*3600) /* Documented default is 2 hours. */
#define DNS_DEFAULT_IDLEIN 3600 /* 1 hour */
#define DNS_DEFAULT_IDLEOUT 3600 /* 1 hour */
/*
* Convenience function for configuring a single zone ACL.
@@ -243,10 +245,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearmasters(zone);
result = dns_c_zone_getmaxtranstimein(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrin(zone, maxxfr);
else
dns_zone_setmaxxfrin(zone, MAX_XFER_TIME);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrin(zone, maxxfr);
result = dns_c_zone_getmaxtransidlein(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidlein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEIN;
}
dns_zone_setidlein(zone, maxxfr);
result = dns_c_zone_gettransfersource(czone, &sockaddr);
if (result != ISC_R_SUCCESS) {
@@ -257,12 +269,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
}
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtransidlein(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidlein(zone, idle);
else
dns_zone_setidlein(zone, 0);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrout(zone, maxxfr);
@@ -316,10 +322,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearmasters(zone);
result = dns_c_zone_getmaxtranstimein(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrin(zone, maxxfr);
else
dns_zone_setmaxxfrin(zone, MAX_XFER_TIME);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrin(zone, maxxfr);
result = dns_c_zone_getmaxtransidlein(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidlein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEIN;
}
dns_zone_setidlein(zone, maxxfr);
result = dns_c_zone_gettransfersource(czone, &sockaddr);
if (result != ISC_R_SUCCESS) {
@@ -330,14 +346,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
}
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtransidlein(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidlein(zone, idle);
else
dns_zone_setidlein(zone, 0);
break;
case dns_c_zone_hint:
dns_zone_settype(zone, dns_zone_hint);
result = dns_c_zone_getfile(czone, &filename);

52
lib/dns/zoneconf.c
View File

@@ -29,6 +29,8 @@
/* XXX copied from zone.c */
#define MAX_XFER_TIME (2*3600) /* Documented default is 2 hours. */
#define DNS_DEFAULT_IDLEIN 3600 /* 1 hour */
#define DNS_DEFAULT_IDLEOUT 3600 /* 1 hour */
/*
* Convenience function for configuring a single zone ACL.
@@ -243,10 +245,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearmasters(zone);
result = dns_c_zone_getmaxtranstimein(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrin(zone, maxxfr);
else
dns_zone_setmaxxfrin(zone, MAX_XFER_TIME);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrin(zone, maxxfr);
result = dns_c_zone_getmaxtransidlein(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidlein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEIN;
}
dns_zone_setidlein(zone, maxxfr);
result = dns_c_zone_gettransfersource(czone, &sockaddr);
if (result != ISC_R_SUCCESS) {
@@ -257,12 +269,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
}
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtransidlein(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidlein(zone, idle);
else
dns_zone_setidlein(zone, 0);
result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrout(zone, maxxfr);
@@ -316,10 +322,20 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
dns_zone_clearmasters(zone);
result = dns_c_zone_getmaxtranstimein(czone, &maxxfr);
if (result == ISC_R_SUCCESS)
dns_zone_setmaxxfrin(zone, maxxfr);
else
dns_zone_setmaxxfrin(zone, MAX_XFER_TIME);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransfertimein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = MAX_XFER_TIME;
}
dns_zone_setmaxxfrin(zone, maxxfr);
result = dns_c_zone_getmaxtransidlein(czone, &maxxfr);
if (result != ISC_R_SUCCESS) {
result = dns_c_ctx_getmaxtransferidlein(cctx, &maxxfr);
if (result != ISC_R_SUCCESS)
maxxfr = DNS_DEFAULT_IDLEIN;
}
dns_zone_setidlein(zone, maxxfr);
result = dns_c_zone_gettransfersource(czone, &sockaddr);
if (result != ISC_R_SUCCESS) {
@@ -330,14 +346,6 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac,
}
dns_zone_setxfrsource4(zone, &sockaddr);
result = dns_c_zone_getmaxtransidlein(czone, &idle);
if (result == ISC_R_SUCCESS)
dns_zone_setidlein(zone, idle);
else
dns_zone_setidlein(zone, 0);
break;
case dns_c_zone_hint:
dns_zone_settype(zone, dns_zone_hint);
result = dns_c_zone_getfile(czone, &filename);