Detach rpzs and catzs from the previous view

When switching to a new view during a reconfiguration (or reverting
to the old view), detach the 'rpzs' and 'catzs' from the previuos view.

The 'catzs' case was earlier solved slightly differently, by detaching
from the new view when reverting to the old view, but we can not solve
this the same way for 'rpzs', because now in BIND 9.19 and BIND 9.18
a dns_rpz_shutdown_rpzs() call was added in view's destroy() function
before detaching the 'rpzs', so we can not leave the 'rpzs' attached to
the previous view and let it be shut down when we intend to continue
using it with the new view.

Instead, "re-fix" the issue for the 'catzs' pointer the same way as
for 'rpzs' for consistency, and also because a similar shutdown call
is likely to be implemented for 'catzs' in the near future.

(cherry picked from commit 121a095a22302472bc545476ea64f6b79bef9da6)

diff --git a/bin/named/server.c b/bin/named/server.c
index a23c4ed107e76ea0cd7482754399f4330bea47b6..4ab75044f6deea0a6e69afda841095273f11c3dd 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -2671,6 +2671,7 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t **maps,
        if (*old_rpz_okp) {
                dns_rpz_detach_rpzs(&view->rpzs);
                dns_rpz_attach_rpzs(pview->rpzs, &view->rpzs);
+               dns_rpz_detach_rpzs(&pview->rpzs);
        } else if (old != NULL && pview != NULL) {
                ++pview->rpzs->rpz_ver;
                view->rpzs->rpz_ver = pview->rpzs->rpz_ver;
@@ -3173,6 +3174,7 @@ configure_catz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *config,
        if (old != NULL) {
                dns_catz_catzs_detach(&view->catzs);
                dns_catz_catzs_attach(pview->catzs, &view->catzs);
+               dns_catz_catzs_detach(&pview->catzs);
                dns_catz_prereconfig(view->catzs);
        }
 
@@ -5878,9 +5880,6 @@ cleanup:
                            named_config_get(maps, "catalog-zones", &obj) ==
                                    ISC_R_SUCCESS)
                        {
-                               if (pview->catzs != NULL) {
-                                       dns_catz_catzs_detach(&pview->catzs);
-                               }
                                /*
                                 * We are swapping the places of the `view` and
                                 * `pview` in the function's parameters list