diff --git a/CHANGES b/CHANGES index 078d013c1e..96d2e8e958 100644 --- 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 710754d0fc..26687c92d6 100644 --- 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 @@ -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.