- Fix to return after failed auth zone http chunk write.

- Fix to remove unused test for task_probe existance.

diff --git a/doc/Changelog b/doc/Changelog
index 7042734d8a74b1c115a1995ea05f15922a5e77f3..e6b0de40d7d29dc8eac9e094e542fd37f0b2148d 100644 (file)
--- 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 523a2cdcaf9bc18858e5c288b84b2046ded4822f..792dc20496748391b41286ea81a4663baaff84b1 100644 (file)
--- 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) {