Commit 9368d7df authored by Mark Andrews's avatar Mark Andrews
Browse files

1433. [bug] named could trigger a REQUIRE failure if it could

                        not get a file descriptor when attempting to write
                        a master file. [RT #4347]
developer: marka
reviewer: explorer
parent 8116cbb2
1433. [bug] named could trigger a REQUIRE failure if it could
not get a file descriptor when attempting to write
a master file. [RT #4347]
1432. [func] The advertised EDNS UDP buffer size can now be set 1432. [func] The advertised EDNS UDP buffer size can now be set
via named.conf (edns-udp-size). via named.conf (edns-udp-size).
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.382 2003/02/07 01:54:56 marka Exp $ */ /* $Id: zone.c,v 1.383 2003/02/26 03:06:46 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -2261,17 +2261,17 @@ dump_done(void *arg, isc_result_t result) { ...@@ -2261,17 +2261,17 @@ dump_done(void *arg, isc_result_t result) {
ENTER; ENTER;
if (result == ISC_R_SUCCESS && zone->journal != NULL &&
zone->journalsize != -1) {
isc_uint32_t serial;
isc_result_t tresult;
/* /*
* We don't own these, zone->dctx must stay valid. * We don't own these, zone->dctx must stay valid.
*/ */
db = dns_dumpctx_db(zone->dctx); db = dns_dumpctx_db(zone->dctx);
version = dns_dumpctx_version(zone->dctx); version = dns_dumpctx_version(zone->dctx);
if (result == ISC_R_SUCCESS && zone->journal != NULL &&
zone->journalsize != -1) {
isc_uint32_t serial;
isc_result_t tresult;
tresult = dns_db_getsoaserial(db, version, &serial); tresult = dns_db_getsoaserial(db, version, &serial);
if (tresult == ISC_R_SUCCESS) { if (tresult == ISC_R_SUCCESS) {
tresult = dns_journal_compact(zone->mctx, zone->journal, tresult = dns_journal_compact(zone->mctx, zone->journal,
...@@ -2311,6 +2311,7 @@ dump_done(void *arg, isc_result_t result) { ...@@ -2311,6 +2311,7 @@ dump_done(void *arg, isc_result_t result) {
} else if (result == ISC_R_SUCCESS) } else if (result == ISC_R_SUCCESS)
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_FLUSH); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_FLUSH);
if (zone->dctx != NULL)
dns_dumpctx_detach(&zone->dctx); dns_dumpctx_detach(&zone->dctx);
UNLOCK_ZONE(zone); UNLOCK_ZONE(zone);
if (again) if (again)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment