From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 14 Sep 2020 08:56:40 +0000 (+0200)
Subject: Make code more clear by eliminating the "ancestor" as suggested by @rgacogne
X-Git-Tag: rec-4.5.0-alpha0~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1722d283bd3cf119870988213e9052bf0312a3e3;p=thirdparty%2Fpdns.git

Make code more clear by eliminating the "ancestor" as suggested by @rgacogne
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 2b06197fec..1973bd8b1a 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -737,16 +737,16 @@ int SyncRes::doResolve(const DNSName &qname, const QType &qtype, vector<DNSRecor
         QLOG("Step1 No ancestor found return ServFail");
         return RCode::ServFail;
       }
+      child = fwdomain;
     } else {
       QLOG("Step1 Ancestor from cache is " << bestns[0].d_name);
+      if (forwarded) {
+        child = bestns[0].d_name.isPartOf(fwdomain) ? bestns[0].d_name : fwdomain;
+        QLOG("Step1 Final Ancestor (using forwarding info) is " << child);
+      } else {
+        child = bestns[0].d_name;
+      }
     }
-    const DNSName& ancestor(!forwarded || (bestns.size() > 0 && bestns[0].d_name.isPartOf(fwdomain)) ?
-                            bestns[0].d_name : fwdomain);
-    if (forwarded) {
-      QLOG("Step1 Final Ancestor (using forwarding info) is " << ancestor);
-    }
-
-    child = ancestor;
 
     unsigned int targetlen = std::min(child.countLabels() + (i > 3 ? 3 : 1), qnamelen);