Revert GL !8123

This reverts commit 302d0d36f7b14d46a68c7e82ee1817b6a1417b03
(7e9e96ba01939df495b710e3369955e6eaac6443 and
bd912b7bed42b68ed4dcf598ead830dd3cfc9149), reversing changes made to
fc6992b3fb29505899a3624729a6b71106ab891c.

diff --git a/CHANGES b/CHANGES
index a9de4f0dd5fb081b760edd6d21ae1144a7e04283..e41aed56feed737bb9cd00261f3861a20052da0a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,3 @@
-6213.  [bug]           Mark a primary server as temporarily unreachable if the
-                       TCP connection attempt times out. [GL #4215]
-
 6212.  [bug]           Don't process detach and close netmgr events when
                        the netmgr has been paused. [GL #4200]
 

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 1e3ccaf8b51aed275143085917071078750a3db9..a54d0d84a266b94ff526b6ba7efc3a8d3f8b3a13 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1520,22 +1520,12 @@ failure:
 static void
 xfrin_timeout(isc_task_t *task, isc_event_t *event) {
        dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *)event->ev_arg;
-       dns_zonemgr_t *zmgr = NULL;
 
        REQUIRE(VALID_XFRIN(xfr));
 
        UNUSED(task);
 
        isc_event_free(&event);
-
-       zmgr = dns_zone_getmgr(xfr->zone);
-       if (zmgr != NULL) {
-               isc_time_t now;
-               TIME_NOW(&now);
-               dns_zonemgr_unreachableadd(zmgr, &xfr->masteraddr,
-                                          &xfr->sourceaddr, &now);
-       }
-
        /*
         * This will log "giving up: timeout".
         */