From c6a691b57bacb141b71c99aaed4ac4808c298e81 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Mon, 23 Mar 2026 11:29:28 -0700 Subject: [PATCH] Revert "Store zone config also on modzone" This reverts commit 85453d393d1b591ae1108603308c79dd63acca85. This commit doesn't seem to be a complete solution of what it appears to fix: showzone succeeds and shows the modified config after first modzone, but subsequent attempts of modzone fail (though not because of the commit being reverted), let alone showing the correct new config. Revering the change for now, and will provide a more comprehensive fix in the next commit. (cherry picked from commit 17416af24878d305000ca9035b48a7d837973662) --- bin/named/server.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index 52c8b969e4..21edf38377 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -14458,18 +14458,6 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, TCHECK(putstr(text, zname)); TCHECK(putstr(text, "' reconfigured.")); } else { -#ifdef HAVE_LMDB - CHECK(nzd_open(view, 0, &txn, &dbi)); - CHECK(nzd_save(&txn, dbi, zone, zoneobj)); -#else /* ifdef HAVE_LMDB */ - result = nzf_append(view, zoneobj); - if (result != ISC_R_SUCCESS) { - TCHECK(putstr(text, "\nNew zone config not saved: ")); - TCHECK(putstr(text, isc_result_totext(result))); - goto cleanup; - } -#endif /* HAVE_LMDB */ - TCHECK(putstr(text, "zone '")); TCHECK(putstr(text, zname)); TCHECK(putstr(text, "' must also be reconfigured in\n"));