]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Revert "Store zone config also on modzone"
authorJINMEI Tatuya <jtatuya@infoblox.com>
Mon, 23 Mar 2026 18:29:28 +0000 (11:29 -0700)
committerMatthijs Mekking <matthijs@isc.org>
Tue, 24 Mar 2026 15:39:36 +0000 (16:39 +0100)
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.

bin/named/server.c

index 28ca7dc922ba586c103297506038e4c403bedfd0..95b387e34223e4013ab2bd73e616fa149a407185 100644 (file)
@@ -14301,18 +14301,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"));