pullup:

1165.   [bug]           We were rejecting notify-source{-v6} in zone clauses.

diff --git a/CHANGES b/CHANGES
index d8d19c32889e5d0acbbcdbc70f0c6a6f99eccf64..c0ef88184130832f16cb9a69375881dbc7c197a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@
                        for clients that are supplied recursive service.
                        [RT #2260]
 
+1165.  [bug]           We were rejecting notify-source{-v6} in zone clauses.
+
 1164.  [bug]           Empty masters clauses in slave / stub zones were not
                        handled gracefully. [RT #2262]
 

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 3d0826b034951196b079ad3ebbb8bcf54dbd268c..07cde4a5c4b8fc407d24d43bda3c601e8ef60d14 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.10 2001/12/13 06:50:59 marka Exp $ */
+/* $Id: parser.c,v 1.70.2.11 2002/01/22 23:14:45 gson Exp $ */
 
 #include <config.h>
 
@@ -876,8 +876,6 @@ view_clauses[] = {
         */
        { "query-source", &cfg_type_querysource4, 0 },
        { "query-source-v6", &cfg_type_querysource6, 0 },
-       { "notify-source", &cfg_type_sockaddr4wild, 0 },
-       { "notify-source-v6", &cfg_type_sockaddr6wild, 0 },
        { "cleaning-interval", &cfg_type_uint32, 0 },
        { "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP },
        { "lame-ttl", &cfg_type_uint32, 0 },
@@ -913,6 +911,8 @@ zone_clauses[] = {
        { "allow-update-forwarding", &cfg_type_bracketed_aml, 0 },
        { "allow-notify", &cfg_type_bracketed_aml, 0 },
        { "notify", &cfg_type_notifytype, 0 },
+       { "notify-source", &cfg_type_sockaddr4wild, 0 },
+       { "notify-source-v6", &cfg_type_sockaddr6wild, 0 },
        { "also-notify", &cfg_type_portiplist, 0 },
        { "dialup", &cfg_type_dialuptype, 0 },
        { "forward", &cfg_type_forwardtype, 0 },