From b78f21115c0ee4ae539a3d0d24e065f982a15b19 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Fri, 21 Apr 2000 00:20:22 +0000 Subject: [PATCH] apply view and global defaults for 'max-transfer-idle-out' option in the correct order --- bin/named/zoneconf.c | 8 ++++---- lib/dns/zoneconf.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 89f9455cf3..fd4596764d 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -206,10 +206,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrout(zone, maxxfr); result = dns_c_zone_getmaxtransidleout(czone, &maxxfr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxtransferidleout(cview, &maxxfr); + if (result != ISC_R_SUCCESS) + result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS) maxxfr = DNS_DEFAULT_IDLEOUT; dns_zone_setidleout(zone, maxxfr); @@ -317,10 +317,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrout(zone, maxxfr); result = dns_c_zone_getmaxtransidleout(czone, &maxxfr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxtransferidleout(cview, &maxxfr); + if (result != ISC_R_SUCCESS) + result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS) maxxfr = DNS_DEFAULT_IDLEOUT; dns_zone_setidleout(zone, maxxfr); diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index 89f9455cf3..fd4596764d 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -206,10 +206,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrout(zone, maxxfr); result = dns_c_zone_getmaxtransidleout(czone, &maxxfr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxtransferidleout(cview, &maxxfr); + if (result != ISC_R_SUCCESS) + result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS) maxxfr = DNS_DEFAULT_IDLEOUT; dns_zone_setidleout(zone, maxxfr); @@ -317,10 +317,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrout(zone, maxxfr); result = dns_c_zone_getmaxtransidleout(czone, &maxxfr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxtransferidleout(cview, &maxxfr); + if (result != ISC_R_SUCCESS) + result = dns_c_ctx_getmaxtransferidleout(cctx, &maxxfr); if (result != ISC_R_SUCCESS) maxxfr = DNS_DEFAULT_IDLEOUT; dns_zone_setidleout(zone, maxxfr);