3376. [bug] Lack of EDNS support was being recorded without a

                        successful response. [RT #30811]

diff --git a/CHANGES b/CHANGES
index 1275563dc83383c2c2a3f7ab97f0e27e0974d6b5..14efda3be2ac8c5b44aa5b56dbab136a2efc22a5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3376.  [bug]           Lack of EDNS support was being recorded without a
+                       successful response. [RT #30811]
+
 3375.  [bug]           'rndc dumpdb' failed on empty caches. [RT #30808]
 
 3374.   [bug]           isc_parse_uint32 failed to return a range error on 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index d81de760e171b1a14dfff1c0b4e249f71c6085e4..46af973a84ee5415f971803fc9e9ccb4ab679c20 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -6627,13 +6627,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                         */
                        options |= DNS_FETCHOPT_NOEDNS0;
                        resend = ISC_TRUE;
-                       /*
-                        * Remember that they don't like EDNS0.
-                        */
-                       dns_adb_changeflags(fctx->adb,
-                                           query->addrinfo,
-                                           DNS_FETCHOPT_NOEDNS0,
-                                           DNS_FETCHOPT_NOEDNS0);
+                       add_bad_edns(fctx, &query->addrinfo->sockaddr);
                } else {
                        /*
                         * There's no hope for this query.
@@ -6700,14 +6694,8 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                         */
                                        options |= DNS_FETCHOPT_NOEDNS0;
                                        resend = ISC_TRUE;
-                                       /*
-                                        * Remember that they don't like EDNS0.
-                                        */
-                                       dns_adb_changeflags(
-                                                       fctx->adb,
-                                                       query->addrinfo,
-                                                       DNS_FETCHOPT_NOEDNS0,
-                                                       DNS_FETCHOPT_NOEDNS0);
+                                       add_bad_edns(fctx,
+                                                   &query->addrinfo->sockaddr);
                                        inc_stats(fctx->res,
                                                 dns_resstatscounter_edns0fail);
                                } else {
@@ -6731,13 +6719,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                 */
                                options |= DNS_FETCHOPT_NOEDNS0;
                                resend = ISC_TRUE;
-                               /*
-                                * Remember that they don't like EDNS0.
-                                */
-                               dns_adb_changeflags(fctx->adb,
-                                                   query->addrinfo,
-                                                   DNS_FETCHOPT_NOEDNS0,
-                                                   DNS_FETCHOPT_NOEDNS0);
+                               add_bad_edns(fctx, &query->addrinfo->sockaddr);
                                inc_stats(fctx->res,
                                                 dns_resstatscounter_edns0fail);
                        } else {