2277. [bug] Empty zone names were not correctly being caught at

                        in the post parse checks. [RT #17357]

diff --git a/CHANGES b/CHANGES
index 268008ad033a5f322b451690e8e652feac594c92..68e14d78b3a7ba51c080601ab82cb449651b1d7c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2277.  [bug]           Empty zone names were not correctly being caught at
+                       in the post parse checks. [RT #17357]
+
 2276.  [bug]           Install <dst/gssapi.h>.  [RT# 17359]
 
 2275.  [func]          Add support to dig to perform IXFR queries over UDP.

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 0a06ea2f47458d1c59741a87bade5ef0b9920c9a..92a3ba7336d97007da5638b2954afab81355dff2 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.85 2007/12/02 21:58:23 marka Exp $ */
+/* $Id: check.c,v 1.86 2007/12/14 01:27:12 marka Exp $ */
 
 /*! \file */
 
@@ -1097,18 +1097,18 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
        isc_buffer_add(&b, strlen(zname));
        tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b,
                                   dns_rootname, ISC_TRUE, NULL);
-       if (result != ISC_R_SUCCESS) {
+       if (tresult != ISC_R_SUCCESS) {
                cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
                            "zone '%s': is not a valid name", zname);
-               tresult = ISC_R_FAILURE;
+               result = ISC_R_FAILURE;
        } else {
                char namebuf[DNS_NAME_FORMATSIZE];
 
                dns_name_format(dns_fixedname_name(&fixedname),
                                namebuf, sizeof(namebuf));
                tresult = nameexist(zconfig, namebuf, ztype == HINTZONE ? 1 : 2,
-                                  symtab, "zone '%s': already exists "
-                                  "previous definition: %s:%u", logctx, mctx);
+                                   symtab, "zone '%s': already exists "
+                                   "previous definition: %s:%u", logctx, mctx);
                if (tresult != ISC_R_SUCCESS)
                        result = tresult;
        }