From: Miod Vallat <miod.vallat@powerdns.com>
Date: Wed, 2 Jul 2025 10:30:54 +0000 (+0200)
Subject: Simplify updateDNSSECOrderNameAndAuth() further wrt NSEC3 chains.
X-Git-Tag: rec-5.3.0-alpha2~10^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6517e4b19e2cd0d7192c16ce98fe83c45f3090a;p=thirdparty%2Fpdns.git

Simplify updateDNSSECOrderNameAndAuth() further wrt NSEC3 chains.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>
---

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 3bad4e97e9..83b3a7fda5 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -2749,22 +2749,12 @@ bool LMDBBackend::updateDNSSECOrderNameAndAuth(domainid_t domain_id, const DNSNa
     }
   } while (cursor.next(key, val) == 0);
 
-  bool updateNSEC3{true};
-  matchkey = co(domain_id, rel, QType::NSEC3);
-  // cerr<<"here qname="<<qname<<" ordername="<<ordername<<" qtype="<<qtype<<" matchkey="<<makeHexDump(matchkey)<<endl;
-  if (txn->txn->get(txn->db->dbi, matchkey, val) == 0) {
-    if (!needNSEC3) {
-      // NSEC3 link to be removed: need to remove the existing pair.
-      updateNSEC3 = false;
-      LMDBResourceRecord lrr;
-      deserializeFromBuffer(val.get<string_view>(), lrr);
-      DNSName prevordername(lrr.content.c_str(), lrr.content.size(), 0, false);
-      txn->txn->del(txn->db->dbi, co(domain_id, prevordername, QType::NSEC3));
-      txn->txn->del(txn->db->dbi, matchkey);
-    }
+  if (!needNSEC3) {
+    // NSEC3 link to be removed: need to remove an existing pair, if any
+    deleteNSEC3RecordPair(txn, domain_id, rel);
   }
-
-  if (needNSEC3 && hasOrderName && updateNSEC3) {
+  else if (hasOrderName) {
+    // NSEC3 link to be added or updated
     writeNSEC3RecordPair(txn, domain_id, rel, ordername);
   }