From 44f34df0af371e91c6daf245724dc3fa6243a63f Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 9 Oct 2023 12:02:24 +0200
Subject: [PATCH] Apply suggestion from review by @rgacogne, thanks!

---
 pdns/recursordist/rec-main.cc        | 2 +-
 pdns/recursordist/settings/table.py  | 1 +
 pdns/recursordist/syncres.cc         | 9 ++++-----
 pdns/recursordist/syncres.hh         | 2 +-
 pdns/recursordist/test-syncres_cc.cc | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index fd713a11fd1e1..aa964c82a3d24 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -1687,7 +1687,7 @@ static int initSyncRes(Logr::log_t log)
   SyncRes::s_ecscachelimitttl = ::arg().asNum("ecs-cache-limit-ttl");
 
   SyncRes::s_qnameminimization = ::arg().mustDo("qname-minimization");
-  SyncRes::s_minimize_one_lab = ::arg().asNum("qname-minimize-one-label");
+  SyncRes::s_minimize_one_label = ::arg().asNum("qname-minimize-one-label");
   SyncRes::s_max_minimize_count = ::arg().asNum("qname-max-minimize-count");
 
   SyncRes::s_hardenNXD = SyncRes::HardenNXD::DNSSEC;
diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py
index 826d843c7b6d6..31d24af82826f 100644
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -1980,6 +1980,7 @@
         'doc' : '''
 ``Minimize one label`` parameter, described in :rfc:`9156`.
 The value for the number of iterations of the Query Name Minimization Algorithm that should only have one label appended.
+This value has precedence over :ref:`setting-qname-max-minimize-count`.
  ''',
     'versionadded': '5.0.0'
     },
diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
index 52bfa75d792f9..2b784741cb872 100644
--- a/pdns/recursordist/syncres.cc
+++ b/pdns/recursordist/syncres.cc
@@ -1599,13 +1599,13 @@ LWResult::Result SyncRes::asyncresolveWrapper(const ComboAddress& address, bool
 /* maximum number of QNAME minimization iterations */
 unsigned int SyncRes::s_max_minimize_count; // default is 10
 /* number of iterations that should only have one label appended */
-unsigned int SyncRes::s_minimize_one_lab; // default is 4
+unsigned int SyncRes::s_minimize_one_label; // default is 4
 
 static unsigned int qmStepLen(unsigned int labels, unsigned int qnamelen, unsigned int i)
 {
   unsigned int step;
 
-  if (i < SyncRes::s_minimize_one_lab) {
+  if (i < SyncRes::s_minimize_one_label) {
     step = 1;
   }
   else if (i < SyncRes::s_max_minimize_count) {
@@ -1695,7 +1695,7 @@ int SyncRes::doResolve(const DNSName& qname, const QType qtype, vector<DNSRecord
     LOG(prefix << qname << ": Step0 qname is in a forwarded domain " << fwdomain << endl);
   }
 
-  for (unsigned int i = 0; i <= qnamelen;) {
+  for (unsigned int i = 0; i <= qnamelen; i++) {
 
     // Step 1
     vector<DNSRecord> bestns;
@@ -1714,7 +1714,7 @@ int SyncRes::doResolve(const DNSName& qname, const QType qtype, vector<DNSRecord
       }
     }
 
-    if (bestns.size() == 0) {
+    if (bestns.empty()) {
       if (!forwarded) {
         // Something terrible is wrong
         LOG(prefix << qname << ": Step1 No ancestor found return ServFail" << endl);
@@ -1788,7 +1788,6 @@ int SyncRes::doResolve(const DNSName& qname, const QType qtype, vector<DNSRecord
       LOG(prefix << qname << ": Step4 Resolve " << child << "|A result is " << RCode::to_s(res) << "/" << retq.size() << "/" << stopAtDelegation << endl);
       if (stopAtDelegation == Stopped) {
         LOG(prefix << qname << ": Delegation seen, continue at step 1" << endl);
-        i++;
         break;
       }
 
diff --git a/pdns/recursordist/syncres.hh b/pdns/recursordist/syncres.hh
index 44f41c5f3a5dc..9fe98262ac767 100644
--- a/pdns/recursordist/syncres.hh
+++ b/pdns/recursordist/syncres.hh
@@ -551,7 +551,7 @@ public:
   static unsigned int s_max_busy_dot_probes;
   static unsigned int s_max_CNAMES_followed;
   static unsigned int s_max_minimize_count;
-  static unsigned int s_minimize_one_lab;
+  static unsigned int s_minimize_one_label;
 
   static const int event_trace_to_pb = 1;
   static const int event_trace_to_log = 2;
diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc
index b544195ceb008..50e45a80f2e6e 100644
--- a/pdns/recursordist/test-syncres_cc.cc
+++ b/pdns/recursordist/test-syncres_cc.cc
@@ -183,7 +183,7 @@ void initSR(bool debug)
   SyncRes::s_save_parent_ns_set = true;
   SyncRes::s_maxnsperresolve = 13;
   SyncRes::s_locked_ttlperc = 0;
-  SyncRes::s_minimize_one_lab = 4;
+  SyncRes::s_minimize_one_label = 4;
   SyncRes::s_max_minimize_count = 10;
 
   SyncRes::clearNSSpeeds();