From 7ed2d93fa4e12e0ceaa0c7c0da3a89e7a5d78296 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 18 Jan 2001 19:01:39 +0000 Subject: [PATCH] 691. [bug] Configuring per-view forwarders caused an assertion failure. [RT #675] --- CHANGES | 4 ++++ lib/dns/config/confview.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index aaf4cde63b..670ac42753 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ + + 691. [bug] Configuring per-view forwarders caused an assertion + failure. [RT #675] + 690. [func] $GENERATE now supports DNAME. [RT #654] 689. [doc] man pages are now installed. [RT #210] diff --git a/lib/dns/config/confview.c b/lib/dns/config/confview.c index 00f94f9e7c..010af1ef81 100644 --- a/lib/dns/config/confview.c +++ b/lib/dns/config/confview.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confview.c,v 1.68 2001/01/09 21:52:08 bwelling Exp $ */ +/* $Id: confview.c,v 1.69 2001/01/18 19:01:39 gson Exp $ */ #include @@ -1188,13 +1188,14 @@ dns_c_view_getforwarders(dns_c_view_t *view, REQUIRE(DNS_C_VIEW_VALID(view)); REQUIRE(ipl != NULL); - *ipl = view->forwarders; + if (view->forwarders == NULL) + return (ISC_R_NOTFOUND); - return (*ipl == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS); + dns_c_iplist_attach(view->forwarders, ipl); + return (ISC_R_SUCCESS); } - /* ** */