4242. [bug] Replace the client if not already replaced when

                        prefetching. [RT #41001]

diff --git a/CHANGES b/CHANGES
index 4b820f108d4f18e9b6232e3314cc470cf235c42d..7a288004294fbaf69fa8ccb806b3d2c3457616ba 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4242.  [bug]           Replace the client if not already replaced when
+                       prefetching. [RT #41001]
+
 4241.  [doc]           Improved the TSIG, TKEY, and SIG(0) sections in
                        the ARM. [RT #40955]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 63187c77c2f4c4c21434f95ca5905ddf7432fa9e..6d14128e795f30e55d60f0b8e3eb7fd2c8dca28d 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -3945,6 +3945,8 @@ query_prefetch(ns_client_t *client, dns_name_t *qname,
        if (client->recursionquota == NULL) {
                result = isc_quota_attach(&ns_g_server->recursionquota,
                                          &client->recursionquota);
+               if (result == ISC_R_SUCCESS && !client->mortal && !TCP(client))
+                       result = ns_client_replace(client);
                if (result != ISC_R_SUCCESS)
                        return;
                isc_stats_increment(ns_g_server->nsstats,