From f2faf893e0807a4b5d402a062d476bd228d87f4b Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sat, 10 Apr 2004 05:02:59 +0000 Subject: [PATCH] 1601. [bug] Silence spurious warning 'both "recursion no;" and "allow-recursion" active' warning from view "_bind". [RT# 10920] --- CHANGES | 4 ++++ bin/named/server.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 21cbc9b3a3..281bff46b3 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,10 @@ 1602. [bug] Logging to a file failed unless a size was specified. [RT# 10925] +1601. [bug] Silence spurious warning 'both "recursion no;" and + "allow-recursion" active' warning from view "_bind". + [RT# 10920] + 1455. [bug] missing from server grammar in doc/misc/options. [RT #5616] diff --git a/bin/named/server.c b/bin/named/server.c index 3944cd6eee..a8c0bbd748 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.339.2.25 2004/03/14 23:02:32 marka Exp $ */ +/* $Id: server.c,v 1.339.2.26 2004/04/10 05:02:59 marka Exp $ */ #include @@ -841,8 +841,9 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, CHECK(configure_view_acl(vconfig, config, "allow-query", actx, ns_g_mctx, &view->queryacl)); - CHECK(configure_view_acl(vconfig, config, "allow-recursion", - actx, ns_g_mctx, &view->recursionacl)); + if (strcmp(view->name, "_bind") != 0) + CHECK(configure_view_acl(vconfig, config, "allow-recursion", + actx, ns_g_mctx, &view->recursionacl)); CHECK(configure_view_acl(vconfig, config, "allow-v6-synthesis", actx, ns_g_mctx, &view->v6synthesisacl));