From 6d5b03be41fab615c0ca02cfb79d5d2dd1b59ab4 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 25 May 2000 22:19:34 +0000 Subject: [PATCH] wired up per-view 'servers' statement --- bin/named/server.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index 8e96cc408d..ba2c3feb3f 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -549,11 +549,16 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, */ { dns_peerlist_t *newpeers = NULL; - if (cctx->peers != NULL) { - dns_peerlist_attach(cctx->peers, &newpeers); - } else { - CHECK(dns_peerlist_new(mctx, &newpeers)); - } + + result = ISC_R_NOTFOUND; + if (cview != NULL) + result = dns_c_view_getpeerlist(cview, &newpeers); + if (result != ISC_R_SUCCESS) + result = dns_c_ctx_getpeerlist(cctx, &newpeers); + if (result != ISC_R_SUCCESS) + result = dns_peerlist_new(mctx, &newpeers); + CHECK(result); + dns_peerlist_detach(&view->peers); view->peers = newpeers; /* Transfer ownership. */ }