From 2e91b1f3d417cd65e7ec9db1097dfa12e72d8e47 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Fri, 7 Apr 2000 00:51:32 +0000 Subject: [PATCH] configuring zone acl from default view caused assertion failure --- bin/named/zoneconf.c | 2 +- lib/dns/zoneconf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index d6a18e2363..e891619474 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -49,7 +49,7 @@ configure_zone_acl(dns_c_zone_t *czone, dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_c_ipmatchlist_t *cacl; dns_acl_t *dacl = NULL; result = (*getcacl)(czone, &cacl); - if (result == ISC_R_NOTFOUND && getviewcacl != NULL) { + if (result == ISC_R_NOTFOUND && getviewcacl != NULL && cview != NULL) { result = (*getviewcacl)(cview, &cacl); } if (result == ISC_R_NOTFOUND && getglobalcacl != NULL) { diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index d6a18e2363..e891619474 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -49,7 +49,7 @@ configure_zone_acl(dns_c_zone_t *czone, dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_c_ipmatchlist_t *cacl; dns_acl_t *dacl = NULL; result = (*getcacl)(czone, &cacl); - if (result == ISC_R_NOTFOUND && getviewcacl != NULL) { + if (result == ISC_R_NOTFOUND && getviewcacl != NULL && cview != NULL) { result = (*getviewcacl)(cview, &cacl); } if (result == ISC_R_NOTFOUND && getglobalcacl != NULL) {