pullup:

1162.   [bug]           The allow-notify option was not accepted in slave
                        zone statements.

diff --git a/CHANGES b/CHANGES
index 7ee47b0ffa7ba0d21d42835ad58529086c29fb99..286bf747f990c7150a86ee91fb897ba1469b854c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1162.  [bug]           The allow-notify option was not accepted in slave
+                       zone statements.
+
 1161.  [bug]           named-checkzone looped on unbalanced brackets.
                        [RT #2248]
 

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index b3f0077eda7fcae0a80416f51983d4ee53e3afb4..3d0826b034951196b079ad3ebbb8bcf54dbd268c 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.70.2.9 2001/11/13 02:52:10 marka Exp $ */
+/* $Id: parser.c,v 1.70.2.10 2001/12/13 06:50:59 marka Exp $ */
 
 #include <config.h>
 
@@ -857,7 +857,6 @@ options_clauses[] = {
 
 static cfg_clausedef_t
 view_clauses[] = {
-       { "allow-notify", &cfg_type_bracketed_aml, 0 },
        { "allow-recursion", &cfg_type_bracketed_aml, 0 },
        { "allow-v6-synthesis", &cfg_type_bracketed_aml, 0 },
        { "sortlist", &cfg_type_bracketed_aml, 0 },
@@ -912,6 +911,7 @@ zone_clauses[] = {
        { "allow-query", &cfg_type_bracketed_aml, 0 },
        { "allow-transfer", &cfg_type_bracketed_aml, 0 },
        { "allow-update-forwarding", &cfg_type_bracketed_aml, 0 },
+       { "allow-notify", &cfg_type_bracketed_aml, 0 },
        { "notify", &cfg_type_notifytype, 0 },
        { "also-notify", &cfg_type_portiplist, 0 },
        { "dialup", &cfg_type_dialuptype, 0 },