ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

416. [bug] Slave zones with no master file tried to use a

Browse Source 
NULL pointer for a journal file name when they
                        received an IXFR.
This commit is contained in:
Andreas Gustafsson
2000-08-31 23:56:00 +00:00
parent c5926943a7
commit 4187398298
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,4 +1,8 @@
416. [bug] Slave zones with no master file tried to use a
NULL pointer for a journal file name when they
received an IXFR.
415. [bug] The logging code leaked file descriptors.
414. [bug] Server did not shut down until all incoming zone

20
lib/dns/xfrin.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: xfrin.c,v 1.95 2000/08/31 17:48:47 gson Exp $ */
/* $Id: xfrin.c,v 1.96 2000/08/31 23:56:00 gson Exp $ */
#include <config.h>
@@ -311,6 +311,7 @@ axfr_commit(dns_xfrin_ctx_t *xfr) {
static isc_result_t
ixfr_init(dns_xfrin_ctx_t *xfr) {
isc_result_t result;
char *journalfile;
if (xfr->reqtype != dns_rdatatype_ixfr) {
xfrin_log(xfr, ISC_LOG_ERROR,
@@ -321,8 +322,12 @@ ixfr_init(dns_xfrin_ctx_t *xfr) {
xfr->is_ixfr = ISC_TRUE;
INSIST(xfr->db != NULL);
xfr->difflen = 0;
CHECK(dns_journal_open(xfr->mctx, dns_zone_getjournal(xfr->zone),
ISC_TRUE, &xfr->ixfr.journal));
journalfile = dns_zone_getjournal(xfr->zone);
if (journalfile != NULL)
CHECK(dns_journal_open(xfr->mctx, journalfile,
ISC_TRUE, &xfr->ixfr.journal));
result = ISC_R_SUCCESS;
failure:
return (result);
@@ -354,10 +359,12 @@ ixfr_apply(dns_xfrin_ctx_t *xfr) {
if (xfr->ver == NULL) {
CHECK(dns_db_newversion(xfr->db, &xfr->ver));
CHECK(dns_journal_begin_transaction(xfr->ixfr.journal));
if (xfr->ixfr.journal != NULL)
CHECK(dns_journal_begin_transaction(xfr->ixfr.journal));
}
CHECK(dns_diff_apply(&xfr->diff, xfr->db, xfr->ver));
dns_journal_writediff(xfr->ixfr.journal, &xfr->diff);
if (xfr->ixfr.journal != NULL)
dns_journal_writediff(xfr->ixfr.journal, &xfr->diff);
dns_diff_clear(&xfr->diff);
xfr->difflen = 0;
result = ISC_R_SUCCESS;
@@ -372,7 +379,8 @@ ixfr_commit(dns_xfrin_ctx_t *xfr) {
ixfr_apply(xfr);
if (xfr->ver != NULL) {
/* XXX enter ready-to-commit state here */
CHECK(dns_journal_commit(xfr->ixfr.journal));
if (xfr->ixfr.journal != NULL)
CHECK(dns_journal_commit(xfr->ixfr.journal));
dns_db_closeversion(xfr->db, &xfr->ver, ISC_TRUE);
}
result = ISC_R_SUCCESS;