From d06ab5dccb0886de85342b22a1a551006c4fa487 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 5 Nov 2024 15:02:33 +0100
Subject: [PATCH] Better name for FWCatz: FWCatalogZone

---
 pdns/recursordist/rec-lua-conf.hh        | 2 +-
 pdns/recursordist/rec-xfr.cc             | 2 +-
 pdns/recursordist/rec-xfr.hh             | 6 +++---
 pdns/recursordist/settings/cxxsupport.cc | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pdns/recursordist/rec-lua-conf.hh b/pdns/recursordist/rec-lua-conf.hh
index de794c2f17..762664144d 100644
--- a/pdns/recursordist/rec-lua-conf.hh
+++ b/pdns/recursordist/rec-lua-conf.hh
@@ -108,7 +108,7 @@ public:
   SortList sortlist;
   DNSFilterEngine dfe;
   vector<RPZTrackerParams> rpzs;
-  vector<FWCatz> catalogzones;
+  vector<FWCatalogZone> catalogzones;
   TrustAnchorFileInfo trustAnchorFileInfo; // Used to update the Trust Anchors from file periodically
   map<DNSName, dsset_t> dsAnchors;
   map<DNSName, std::string> negAnchors;
diff --git a/pdns/recursordist/rec-xfr.cc b/pdns/recursordist/rec-xfr.cc
index c43b09d7fc..097a1930af 100644
--- a/pdns/recursordist/rec-xfr.cc
+++ b/pdns/recursordist/rec-xfr.cc
@@ -73,7 +73,7 @@ void CatalogZone::remove(const DNSRecord& record, Logr::log_t logger)
   d_records.erase(std::make_pair(key, record.d_type));
 }
 
-void CatalogZone::registerForwarders(const FWCatz& params, Logr::log_t logger) const
+void CatalogZone::registerForwarders(const FWCatalogZone& params, Logr::log_t logger) const
 {
   const string zonesFile = ::arg()["api-config-dir"] + "/catzone." + d_name.toString();
   ::rust::Vec<::pdns::rust::settings::rec::ForwardZone> forwards;
diff --git a/pdns/recursordist/rec-xfr.hh b/pdns/recursordist/rec-xfr.hh
index 96ce86d3ac..5adc78bfc7 100644
--- a/pdns/recursordist/rec-xfr.hh
+++ b/pdns/recursordist/rec-xfr.hh
@@ -36,7 +36,7 @@
 
 class DNSName;
 class SOARecordContent;
-struct FWCatz;
+struct FWCatalogZone;
 
 // All members of this struct must be copyable, as they are used as parameters in a thread constructor
 struct ZoneXFRParams
@@ -82,7 +82,7 @@ public:
   }
   void add(const DNSRecord& record, Logr::log_t logger);
   void remove(const DNSRecord& record, Logr::log_t logger);
-  void registerForwarders(const FWCatz& params, Logr::log_t logger) const;
+  void registerForwarders(const FWCatalogZone& params, Logr::log_t logger) const;
   [[nodiscard]] bool versionCheck() const;
   [[nodiscard]] bool dupsCheck() const;
 
@@ -93,7 +93,7 @@ private:
   uint32_t d_serial{0};
 };
 
-struct FWCatz
+struct FWCatalogZone
 {
   ZoneXFRParams d_params;
   std::map<std::string, pdns::rust::settings::rec::FCZDefault> d_defaults;
diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc
index b7183e2ef0..f27b3e9f0b 100644
--- a/pdns/recursordist/settings/cxxsupport.cc
+++ b/pdns/recursordist/settings/cxxsupport.cc
@@ -1306,10 +1306,10 @@ void fromRustToLuaConfig(const rust::Vec<pdns::rust::settings::rec::ProxyMapping
   }
 }
 
-void fromRustToLuaConfig(const rust::Vec<pdns::rust::settings::rec::ForwardingCatalogZone>& catzones, std::vector<FWCatz>& lua)
+void fromRustToLuaConfig(const rust::Vec<pdns::rust::settings::rec::ForwardingCatalogZone>& catzones, std::vector<FWCatalogZone>& lua)
 {
   for (const auto& catz : catzones) {
-    FWCatz fwcatz;
+    FWCatalogZone fwcatz;
     for (const auto& def : catz.groups) {
       fwcatz.d_defaults.emplace(def.name, def);
     }
-- 
2.47.2