From 199e6c586b1616ed0ad8f6e872a40219309cf011 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Thu, 1 Aug 2019 16:40:52 +0200 Subject: [PATCH] - Fix to return after failed auth zone http chunk write. - Fix to remove unused test for task_probe existance. --- doc/Changelog | 2 ++ services/authzone.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index 7042734d8..e6b0de40d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,8 @@ 1 August 2019: Wouter - For #52 #53, second context does not close logfile override. - Fix #52 #53, fix for example fail program. + - Fix to return after failed auth zone http chunk write. + - Fix to remove unused test for task_probe existance. 29 July 2019: Wouter - Add verbose log message when auth zone file is written, at level 4. diff --git a/services/authzone.c b/services/authzone.c index 523a2cdca..792dc2049 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -4887,6 +4887,7 @@ xfr_write_after_update(struct auth_xfer* xfr, struct module_env* env) if(!auth_zone_write_chunks(xfr, tmpfile)) { unlink(tmpfile); lock_rw_unlock(&z->lock); + return; } } else if(!auth_zone_write_file(z, tmpfile)) { unlink(tmpfile); @@ -6568,7 +6569,7 @@ xfr_set_timeout(struct auth_xfer* xfr, struct module_env* env, /* don't lookup_only, if lookup timeout is 0 anyway, * or if we don't have masters to lookup */ tv.tv_sec = 0; - if(xfr->task_probe && xfr->task_probe->worker == NULL) + if(xfr->task_probe->worker == NULL) xfr->task_probe->only_lookup = 1; } if(verbosity >= VERB_ALGO) {