From dd7682a5deebc0f1716d3b2b5bcee07d5421d265 Mon Sep 17 00:00:00 2001 From: Michael Graff Date: Thu, 3 Aug 2000 00:41:26 +0000 Subject: [PATCH] only check in the view if it isn't NULL --- bin/named/zoneconf.c | 10 +++++----- lib/dns/zoneconf.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index b7b00b7d17..0b098c158e 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zoneconf.c,v 1.52 2000/08/02 22:29:14 explorer Exp $ */ +/* $Id: zoneconf.c,v 1.53 2000/08/03 00:41:26 explorer Exp $ */ #include @@ -323,7 +323,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setxfrsource6(zone, &sockaddr); result = dns_c_zone_getmaxrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxrefreshtime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxrefreshtime(cctx, &uintval); @@ -332,7 +332,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxrefreshtime(zone, uintval); result = dns_c_zone_getminrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getminrefreshtime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getminrefreshtime(cctx, &uintval); @@ -341,7 +341,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setminrefreshtime(zone, uintval); result = dns_c_zone_getmaxretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxretrytime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxretrytime(cctx, &uintval); @@ -350,7 +350,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxretrytime(zone, uintval); result = dns_c_zone_getminretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getminretrytime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getminretrytime(cctx, &uintval); diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index b7b00b7d17..0b098c158e 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zoneconf.c,v 1.52 2000/08/02 22:29:14 explorer Exp $ */ +/* $Id: zoneconf.c,v 1.53 2000/08/03 00:41:26 explorer Exp $ */ #include @@ -323,7 +323,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setxfrsource6(zone, &sockaddr); result = dns_c_zone_getmaxrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxrefreshtime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxrefreshtime(cctx, &uintval); @@ -332,7 +332,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxrefreshtime(zone, uintval); result = dns_c_zone_getminrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getminrefreshtime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getminrefreshtime(cctx, &uintval); @@ -341,7 +341,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setminrefreshtime(zone, uintval); result = dns_c_zone_getmaxretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxretrytime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxretrytime(cctx, &uintval); @@ -350,7 +350,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxretrytime(zone, uintval); result = dns_c_zone_getminretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getminretrytime(cview, &uintval); if (result != ISC_R_SUCCESS) result = dns_c_ctx_getminretrytime(cctx, &uintval);