From ef20739c3fab77920d1c68280321425432b43ba7 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Wed, 3 Aug 2022 20:56:06 +0200
Subject: [PATCH] dns.hh: move SOAData, DNSBackend to auth-only dnsbackend.hh

---
 pdns/dns.hh        | 20 --------------------
 pdns/dnsbackend.hh | 24 +++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 6f326a0eb8..218c7a3570 100644
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -27,28 +27,8 @@
 
 #undef BADSIG  // signal.h SIG_ERR
 
-class DNSBackend;
 struct DNSRecord;
 
-struct SOAData
-{
-  SOAData() : ttl(0), serial(0), refresh(0), retry(0), expire(0), minimum(0), db(0), domain_id(-1) {};
-
-  DNSName qname;
-  DNSName nameserver;
-  DNSName hostmaster;
-  uint32_t ttl;
-  uint32_t serial;
-  uint32_t refresh;
-  uint32_t retry;
-  uint32_t expire;
-  uint32_t minimum;
-  DNSBackend *db;
-  int domain_id;
-
-  uint32_t getNegativeTTL() const { return min(ttl, minimum); }
-};
-
 class RCode
 {
 public:
diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index 129813bb2f..d7b18b7a88 100644
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -45,7 +45,9 @@ class DNSPacket;
 #include "sha.hh"
 #include "auth-catalogzone.hh"
 
-class DNSBackend;  
+class DNSBackend;
+struct SOAData;
+
 struct DomainInfo
 {
   DomainInfo() : last_check(0), backend(nullptr), id(0), notified_serial(0), receivedNotify(false), serial(0), kind(DomainInfo::Native) {}
@@ -514,6 +516,26 @@ public:
   DBException(const string &reason_) : PDNSException(reason_){}
 };
 
+
+struct SOAData
+{
+  SOAData() : ttl(0), serial(0), refresh(0), retry(0), expire(0), minimum(0), db(0), domain_id(-1) {};
+
+  DNSName qname;
+  DNSName nameserver;
+  DNSName hostmaster;
+  uint32_t ttl;
+  uint32_t serial;
+  uint32_t refresh;
+  uint32_t retry;
+  uint32_t expire;
+  uint32_t minimum;
+  DNSBackend *db;
+  int domain_id;
+
+  uint32_t getNegativeTTL() const { return min(ttl, minimum); }
+};
+
 /** helper function for both DNSPacket and addSOARecord() - converts a line into a struct, for easier parsing */
 void fillSOAData(const string &content, SOAData &data);
 // same but more karmic
-- 
2.47.2