- Fix for IXFR fallback to reset counter when IXFR does not timeout.

git-svn-id: file:///svn/unbound/trunk@5066 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index bb789fbfaadf1962f863088d818e01fea6ebbf46..483be7efafdd388ef581f3a59b1d137e3b6ae97a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -9,6 +9,7 @@
        - Fixes for patch (includes, declarations, warnings).  Free at end
          and keep config options in order read from file to keep the first
          one as the first one.
+       - Fix for IXFR fallback to reset counter when IXFR does not timeout.
 
 22 January 2018: Wouter
        - Fix space calculation for tcp req buffer size.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 9723141b994783910112070dce0058779fa757f2..cbb7b654bfa55e54e9fcef30d31381a9a4b41ce4 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -513,6 +513,9 @@ Other keys use to decrypt only.  With this you can roll over to new keys,
 by generating a new first file and allowing decrypt of the old file by
 listing it after the first file for some time, after the wait clients are not
 using the old key any more and the old key can be removed.
+One way to create the file is dd if=/dev/random bs=1 count=80 of=ticket.dat
+The first 16 bytes should be different from the old one if you create a second key, that is the name used to identify the key.  Then there is 32 bytes random
+data for an AES key and then 32 bytes random data for the HMAC key.
 .TP
 .B tls\-ciphers: \fI<string with cipher list>
 Set the list of ciphers to allow when serving TLS.  Use "" for defaults,

diff --git a/services/authzone.c b/services/authzone.c
index 69163b981f1b04f16d358bdd094be8641c986aaf..03991d9b8a409a8aa187023079cd10b866852d37 100644 (file)
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -5663,7 +5663,9 @@ auth_xfer_transfer_tcp_callback(struct comm_point* c, void* arg, int err,
                xfr_transfer_nexttarget_or_end(xfr, env);
                return 0;
        }
-       xfr->task_transfer->ixfr_possible_timeout_count = 0;
+       /* note that IXFR worked without timeout */
+       if(xfr->task_transfer->on_ixfr)
+               xfr->task_transfer->ixfr_possible_timeout_count = 0;
 
        /* handle returned packet */
        /* if it fails, cleanup and end this transfer */