Cleanup UeberBackend::getSOAUncached

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 89d9298a44b82fa7093b76313dfaf433b829603d..93846a62d28c9cd97cf921b2b1069458e06a6c78 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -488,32 +488,32 @@ bool UeberBackend::getAuth(const DNSName& target, const QType& qtype, SOAData* s
   return found;
 }
 
-bool UeberBackend::getSOAUncached(const DNSName& domain, SOAData& sd)
+bool UeberBackend::getSOAUncached(const DNSName& domain, SOAData& soaData)
 {
   d_question.qtype = QType::SOA;
   d_question.qname = domain;
   d_question.zoneId = -1;
 
   for (auto* backend : backends) {
-    if (backend->getSOA(domain, sd)) {
-      if (domain != sd.qname) {
-        throw PDNSException("getSOA() returned an SOA for the wrong zone. Question: '" + domain.toLogString() + "', answer: '" + sd.qname.toLogString() + "'");
+    if (backend->getSOA(domain, soaData)) {
+      if (domain != soaData.qname) {
+        throw PDNSException("getSOA() returned an SOA for the wrong zone. Question: '" + domain.toLogString() + "', answer: '" + soaData.qname.toLogString() + "'");
       }
-      if (d_cache_ttl) {
-        DNSZoneRecord rr;
-        rr.dr.d_name = sd.qname;
-        rr.dr.d_type = QType::SOA;
-        rr.dr.setContent(makeSOAContent(sd));
-        rr.dr.d_ttl = sd.ttl;
-        rr.domain_id = sd.domain_id;
-
-        addCache(d_question, {rr});
+      if (d_cache_ttl != 0U) {
+        DNSZoneRecord zoneRecord;
+        zoneRecord.dr.d_name = soaData.qname;
+        zoneRecord.dr.d_type = QType::SOA;
+        zoneRecord.dr.setContent(makeSOAContent(soaData));
+        zoneRecord.dr.d_ttl = soaData.ttl;
+        zoneRecord.domain_id = soaData.domain_id;
+
+        addCache(d_question, {zoneRecord});
       }
       return true;
     }
   }
 
-  if (d_negcache_ttl) {
+  if (d_negcache_ttl != 0U) {
     addNegCache(d_question);
   }
   return false;

diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index ff15a5b74d99673bbc7f08b1ec04903bde977624..4ae087d7f2786bfaca67ef02c0d25b140dd4ef7f 100644 (file)
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -100,7 +100,7 @@ public:
   /** Determines if we are authoritative for a zone, and at what level */
   bool getAuth(const DNSName& target, const QType& qtype, SOAData* sd, bool cachedOk = true);
   /** Load SOA info from backends, ignoring the cache.*/
-  bool getSOAUncached(const DNSName& domain, SOAData& sd);
+  bool getSOAUncached(const DNSName& domain, SOAData& soaData);
   bool get(DNSZoneRecord& r);
   void getAllDomains(vector<DomainInfo>* domains, bool getSerial, bool include_disabled);