Merge remote-tracking branch 'origin/master' into rec-throttle-fwd-recurse

diff --cc pdns/dnsname.hh
Simple merge

diff --cc pdns/pdns_recursor.cc
index 749c6750a4909e61330a917c283c6e510d28314b,ae37f9da8d92a4d7daae3a05c00aad63e92faf07..79e2cfba5b36688919562eccc42db6e0acb0f040
--- 1/pdns/pdns_recursor.cc
--- 2/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@@ -3719,23 -3776,12 +3780,29 @@@ static int serviceMain(int argc, char*a
  
    g_statisticsInterval = ::arg().asNum("statistics-interval");
  
 +  {
 +    SuffixMatchNode dontThrottleNames;
 +    vector<string> parts;
 +    stringtok(parts, ::arg()["dont-throttle-names"]);
 +    for (const auto &p : parts) {
 +      dontThrottleNames.add(DNSName(p));
 +    }
 +    g_dontThrottleNames.setState(dontThrottleNames);
 +
 +    NetmaskGroup dontThrottleNetmasks;
 +    stringtok(parts, ::arg()["dont-throttle-netmasks"]);
 +    for (const auto &p : parts) {
 +      dontThrottleNetmasks.addMask(Netmask(p));
 +    }
 +    g_dontThrottleNetmasks.setState(dontThrottleNetmasks);
 +  }
 +
+   s_balancingFactor = ::arg().asDouble("distribution-load-factor");
+   if (s_balancingFactor != 0.0 && s_balancingFactor < 1.0) {
+     s_balancingFactor = 0.0;
+     g_log<<Logger::Warning<<"Asked to run with a distribution-load-factor below 1.0, disabling it instead"<<endl;
+   }
+ 
  #ifdef SO_REUSEPORT
    g_reusePort = ::arg().mustDo("reuseport");
  #endif

diff --cc pdns/rec_channel.hh
Simple merge

diff --cc pdns/rec_channel_rec.cc
Simple merge

diff --cc pdns/recursordist/docs/manpages/rec_control.1.rst
Simple merge

diff --cc pdns/recursordist/docs/settings.rst
Simple merge

diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge

diff --cc pdns/syncres.cc
Simple merge

diff --cc pdns/syncres.hh
Simple merge