1487. [compat] Treat 'allow-update' on slave zones as a warning.

                       [RT #3469]

diff --git a/CHANGES b/CHANGES
index 766a01d4d76382ca38b4cbbf47da9df8ea144302..0a66eb61bba9fcaed1c2b76011297fe3fbc121f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1487.  [compat]        Treat 'allow-update' on slave zones as a warning.
+                       [RT #3469]
+
 1488.  [bug]           Don't override trust levels for glue addresses.
                        [RT #5764]
 

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index aac268a589af44a50b482e5f6af9b45331611c2b..9e273e50969c41efeabfbcf9b0b61132d4e0f95a 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.36 2003/03/20 00:43:08 marka Exp $ */
+/* $Id: check.c,v 1.37 2003/07/18 06:00:41 marka Exp $ */
 
 #include <config.h>
 
@@ -586,11 +586,18 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab,
                    cfg_map_get(zoptions, options[i].name, &obj) ==
                    ISC_R_SUCCESS)
                {
-                       cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                   "option '%s' is not allowed in '%s' "
-                                   "zone '%s'",
-                                   options[i].name, typestr, zname);
-                       result = ISC_R_FAILURE;
+                       if (strcmp(options[i].name, "allow-update") != 0 ||
+                           ztype != SLAVEZONE) {
+                               cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
+                                           "option '%s' is not allowed "
+                                           "in '%s' zone '%s'",
+                                           options[i].name, typestr, zname);
+                                       result = ISC_R_FAILURE;
+                       } else
+                               cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
+                                           "option '%s' is not allowed "
+                                           "in '%s' zone '%s'",
+                                           options[i].name, typestr, zname);
                }
        }