1601. [bug] Silence spurious warning 'both "recursion no;" and

                        "allow-recursion" active' warning from view "_bind".
                        [RT# 10920]

diff --git a/CHANGES b/CHANGES
index 21cbc9b3a33456c9ef31fe32dbccd8d9c355c215..281bff46b3ac929a990e122bc746ec210c916498 100644 (file)
--- 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]           <netaddr> missing from server grammar in
                         doc/misc/options. [RT #5616]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 3944cd6eee44834fa7bf262c81b11527fd2ff258..a8c0bbd7485a7b5d29426fd46f5dde88bcef49fb 100644 (file)
--- 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 <config.h>
 
@@ -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));