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

Stub zones do not transfer out.

Browse Source 
Master zones do transfer out.
This commit is contained in:
Mark Andrews
1999-12-13 05:24:13 +00:00
parent 8436cbc6a4
commit 2ea83bcfe5
2 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
lib/dns/config/confzone.c
View File

@@ -1331,11 +1331,12 @@ dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone,
switch (zone->ztype) { switch (zone->ztype) {
case dns_c_zone_master: case dns_c_zone_master:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, zone->u.mzone.max_trans_time_out = newval ;
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL, existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_OUT_BIT,
"Master zones do not have a " &zone->u.mzone.setflags);
"max_trans_time_out field"); DNS_C_SETBIT(SZ_MAX_TRANS_TIME_OUT_BIT,
return (ISC_R_FAILURE); &zone->u.mzone.setflags);
break;
case dns_c_zone_slave: case dns_c_zone_slave:
zone->u.szone.max_trans_time_out = newval ; zone->u.szone.max_trans_time_out = newval ;
@@ -1346,12 +1347,11 @@ dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone,
break; break;
case dns_c_zone_stub: case dns_c_zone_stub:
zone->u.tzone.max_trans_time_out = newval ; isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
existed = DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_OUT_BIT, DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
&zone->u.tzone.setflags); "Stub zones do not have a "
DNS_C_SETBIT(TZ_MAX_TRANS_TIME_OUT_BIT, "max_trans_time_out field");
&zone->u.tzone.setflags); return (ISC_R_FAILURE);
break;
case dns_c_zone_hint: case dns_c_zone_hint:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
@@ -1433,11 +1433,12 @@ dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone,
switch (zone->ztype) { switch (zone->ztype) {
case dns_c_zone_master: case dns_c_zone_master:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, zone->u.mzone.max_trans_idle_out = newval ;
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL, existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
"Master zones do not have a " &zone->u.mzone.setflags);
"max_trans_idle_out field"); DNS_C_SETBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
return (ISC_R_FAILURE); &zone->u.mzone.setflags);
break;
case dns_c_zone_slave: case dns_c_zone_slave:
zone->u.szone.max_trans_idle_out = newval ; zone->u.szone.max_trans_idle_out = newval ;
@@ -1448,12 +1449,11 @@ dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone,
break; break;
case dns_c_zone_stub: case dns_c_zone_stub:
zone->u.tzone.max_trans_idle_out = newval ; isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
existed = DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_OUT_BIT, DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
&zone->u.tzone.setflags); "Stub zones do not have a "
DNS_C_SETBIT(TZ_MAX_TRANS_IDLE_OUT_BIT, "max_trans_idle_out field");
&zone->u.tzone.setflags); return (ISC_R_FAILURE);
break;
case dns_c_zone_hint: case dns_c_zone_hint:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
@@ -2503,14 +2503,11 @@ dns_c_zone_getmaxtranstimeout(dns_c_zone_t *zone,
break; break;
case dns_c_zone_stub: case dns_c_zone_stub:
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_OUT_BIT, isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
&zone->u.tzone.setflags)) { DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
*retval = zone->u.tzone.max_trans_time_out; "Stub zones do not have a "
res = ISC_R_SUCCESS; "max_trans_time_out field");
} else { return (ISC_R_FAILURE);
res = ISC_R_NOTFOUND;
}
break;
case dns_c_zone_hint: case dns_c_zone_hint:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
@@ -2599,11 +2596,15 @@ dns_c_zone_getmaxtransidleout(dns_c_zone_t *zone,
switch (zone->ztype) { switch (zone->ztype) {
case dns_c_zone_master: case dns_c_zone_master:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG, if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL, &zone->u.mzone.setflags)) {
"Master zones do not have a " *retval = zone->u.mzone.max_trans_idle_out;
"max_trans_idle_out field"); res = ISC_R_SUCCESS;
return (ISC_R_FAILURE); } else {
res = ISC_R_NOTFOUND;
}
break;
case dns_c_zone_slave: case dns_c_zone_slave:
if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT, if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
@@ -2616,13 +2617,11 @@ dns_c_zone_getmaxtransidleout(dns_c_zone_t *zone,
break; break;
case dns_c_zone_stub: case dns_c_zone_stub:
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_OUT_BIT, isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
&zone->u.tzone.setflags)) { DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
*retval = zone->u.tzone.max_trans_idle_out; "Stub zones do not have a "
res = ISC_R_SUCCESS; "max_trans_idle_out field");
} else { return (ISC_R_FAILURE);
res = ISC_R_NOTFOUND;
}
break; break;
case dns_c_zone_hint: case dns_c_zone_hint:
@@ -2897,6 +2896,18 @@ master_zone_print(FILE *fp, int indent,
fprintf(fp, "ixfr-tmp-file \"%s\";\n", mzone->ixfr_tmp); fprintf(fp, "ixfr-tmp-file \"%s\";\n", mzone->ixfr_tmp);
} }
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_OUT_BIT, &mzone->setflags)) {
dns_c_printtabs(fp, indent);
fprintf(fp, "max-transfer-idle-out %d;\n",
mzone->max_trans_idle_out);
}
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_OUT_BIT, &mzone->setflags)) {
dns_c_printtabs(fp, indent);
fprintf(fp, "max-transfer-time-out %d;\n",
mzone->max_trans_time_out);
}
if (mzone->pubkeylist != NULL) { if (mzone->pubkeylist != NULL) {
dns_c_printtabs(fp, indent); dns_c_printtabs(fp, indent);
dns_c_pklist_print(fp, indent, mzone->pubkeylist); dns_c_pklist_print(fp, indent, mzone->pubkeylist);
@@ -3121,24 +3132,12 @@ stub_zone_print(FILE *fp, int indent, dns_c_stubzone_t *tzone)
tzone->max_trans_idle_in); tzone->max_trans_idle_in);
} }
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_OUT_BIT, &tzone->setflags)) {
dns_c_printtabs(fp, indent);
fprintf(fp, "max-transfer-idle-out %d;\n",
tzone->max_trans_idle_out);
}
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_IN_BIT, &tzone->setflags)) { if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_IN_BIT, &tzone->setflags)) {
dns_c_printtabs(fp, indent); dns_c_printtabs(fp, indent);
fprintf(fp, "max-transfer-time-in %d;\n", fprintf(fp, "max-transfer-time-in %d;\n",
tzone->max_trans_time_in); tzone->max_trans_time_in);
} }
if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_OUT_BIT, &tzone->setflags)) {
dns_c_printtabs(fp, indent);
fprintf(fp, "max-transfer-time-out %d;\n",
tzone->max_trans_time_out);
}
if (tzone->pubkeylist != NULL) { if (tzone->pubkeylist != NULL) {
dns_c_printtabs(fp, indent); dns_c_printtabs(fp, indent);
dns_c_pklist_print(fp, indent, tzone->pubkeylist); dns_c_pklist_print(fp, indent, tzone->pubkeylist);

4
lib/dns/include/dns/confzone.h
View File

@@ -120,6 +120,8 @@ struct dns_c_master_zone
isc_int32_t max_ixfr_log; isc_int32_t max_ixfr_log;
isc_boolean_t maint_ixfr_base; isc_boolean_t maint_ixfr_base;
dns_c_pklist_t *pubkeylist; dns_c_pklist_t *pubkeylist;
isc_int32_t max_trans_time_out;
isc_int32_t max_trans_idle_out;
dns_c_forw_t forward; dns_c_forw_t forward;
dns_c_iplist_t *forwarders; dns_c_iplist_t *forwarders;
@@ -171,9 +173,7 @@ struct dns_c_stub_zone
dns_c_iplist_t *master_ips; dns_c_iplist_t *master_ips;
isc_sockaddr_t transfer_source; isc_sockaddr_t transfer_source;
isc_int32_t max_trans_time_in; isc_int32_t max_trans_time_in;
isc_int32_t max_trans_time_out;
isc_int32_t max_trans_idle_in; isc_int32_t max_trans_idle_in;
isc_int32_t max_trans_idle_out;
dns_c_forw_t forward; dns_c_forw_t forward;
dns_c_iplist_t *forwarders; dns_c_iplist_t *forwarders;