Merge tag 'v9.21.10'

diff --cc lib/ns/query.c
index 677c388bd894d45f77018b1f574e8170a1a198f8,4ea0859c82414a27f51edc5436933b15618e4836..fc58f305d4c0cce99b361a58d7463c77f18a4935
--- 1/lib/ns/query.c
--- 2/lib/ns/query.c
+++ b/lib/ns/query.c
@@@ -5939,10 -5935,8 +5939,8 @@@ query_lookup(query_ctx_t *qctx) 
                        {
                                qctx_clean(qctx);
                                qctx_freedata(qctx);
 -                              dns_db_attach(qctx->client->view->cachedb,
 +                              dns_db_attach(qctx->client->inner.view->cachedb,
                                              &qctx->db);
-                               qctx->client->query.dboptions &=
-                                       ~DNS_DBFIND_STALETIMEOUT;
                                qctx->options.stalefirst = false;
                                if (FETCH_RECTYPE_NORMAL(qctx->client) != NULL)
                                {