1208. [bug] dns_master_load*() failed to log a error message if

                        an error was detected when parsing the ownername of
                        a record.  [RT #2448]

diff --git a/CHANGES b/CHANGES
index 078d013c1eab538ae7cc380be1e3d68869bbe25d..96d2e8e95886db2af65f89765bd8187e20fc0e17 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1208.  [bug]           dns_master_load*() failed to log a error message if
+                       an error was detected when parsing the ownername of
+                       a record.  [RT #2448]
+
 1207.  [bug]           libbind: getaddrinfo() could call freeaddrinfo() with
                        an invalid pointer.
 

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 710754d0fc7a743710c25432941d3cea586176da..26687c92d625debb5ae81b5a8f189da4559a833d 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.136 2002/02/21 00:45:09 bwelling Exp $ */
+/* $Id: master.c,v 1.137 2002/02/21 00:51:22 marka Exp $ */
 
 #include <config.h>
 
@@ -1116,10 +1116,11 @@ load(dns_loadctx_t *lctx) {
                                          ictx->origin, ISC_FALSE, NULL);
                        if (MANYERRS(lctx, result)) {
                                SETRESULT(lctx, result);
+                               LOGITFILE(result, include_file);
                                read_till_eol = ISC_TRUE;
                                continue;
                        } else if (result != ISC_R_SUCCESS)
-                               goto insist_and_cleanup;
+                               goto log_and_cleanup;
 
                        /*
                         * Finish $ORIGIN / $INCLUDE processing if required.