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 4b41979bc5ac85f336bb35d7e92f534b7d58ab26..b062f5b0ce6de7801342576e24b465851a406e92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,9 @@
 1602.  [bug]           Logging to a file failed unless a size was specified.
                        [RT# 10925]
 
-1601.  [placeholder]   rt10920.
+1601.  [bug]           Silence spurious warning 'both "recursion no;" and 
+                       "allow-recursion" active' warning from view "_bind".
+                       [RT# 10920]
 
 1600.  [placeholder]   rt10861.
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 89a9b4b2a9092b814fb373c4d3f177be86225cf5..0a6dc833f3abb90bf3dc8eb9cbb71e29f271181f 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.420 2004/04/08 00:10:42 marka Exp $ */
+/* $Id: server.c,v 1.421 2004/04/10 05:03:27 marka Exp $ */
 
 #include <config.h>
 
@@ -1102,8 +1102,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));
 
        /*
         * Warning if both "recursion no;" and allow-recursion are active