From 9425e4ca523f39773deac33954a9a628df569c12 Mon Sep 17 00:00:00 2001
From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 22 Dec 2021 10:42:57 +0100
Subject: [PATCH] Use _config_template and _config_template_default in the
 right way so common settings get inherited if possible

---
 pdns/syncres.cc                               |  8 +++--
 regression-tests.recursor-dnssec/test_ECS.py  | 17 +++--------
 .../test_ExtendedErrors.py                    | 30 +++----------------
 regression-tests.recursor-dnssec/test_Lua.py  | 14 ++-------
 .../test_RoutingTag.py                        | 10 +++----
 5 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 38fdb65536..a92c9c6d0c 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -104,9 +104,11 @@ int SyncRes::s_event_trace_enabled;
 
 #define LOG(x) if(d_lm == Log) { g_log <<Logger::Warning << x; } else if(d_lm == Store) { d_trace << x; }
 
-// A helper function to print a double with specific precsision
-// Not using boost::format since it is not thread safe while calling into locale handling code according to tsan
-// This allocates a string, but that's nothing compared to what boost::format is doing
+// A helper function to print a double with specific printf format.
+// Not using boost::format since it is not thread safe while calling
+// into locale handling code according to tsan.
+// This allocates a string, but that's nothing compared to what
+// boost::format is doing and maybe even gets optimized away anyway.
 static inline std::string fmtfloat(const char* fmt, double f)
 {
   char buf[20];
diff --git a/regression-tests.recursor-dnssec/test_ECS.py b/regression-tests.recursor-dnssec/test_ECS.py
index 9c3642b63e..d619bc6547 100644
--- a/regression-tests.recursor-dnssec/test_ECS.py
+++ b/regression-tests.recursor-dnssec/test_ECS.py
@@ -22,7 +22,6 @@ class ECSTest(RecursorTest):
 daemon=no
 trace=yes
 dont-query=
-ecs-add-for=0.0.0.0/0
 local-address=127.0.0.1
 packetcache-ttl=0
 packetcache-servfail-ttl=0
@@ -30,6 +29,9 @@ max-cache-ttl=600
 threads=1
 loglevel=9
 disable-syslog=yes
+log-common-errors=yes
+statistics-interval=0
+ecs-add-for=0.0.0.0/0
 """
 
     def sendECSQuery(self, query, expected, expectedFirstTTL=None, scopeZeroResponse=None):
@@ -536,21 +538,10 @@ class testECSWithProxyProtocoldRecursorTest(ECSTest):
 class testTooLargeToAddZeroScope(RecursorTest):
 
     _confdir = 'TooLargeToAddZeroScope'
-    _config_template_default = """
+    _config_template = """
 use-incoming-edns-subnet=yes
 dnssec=validate
-daemon=no
-trace=yes
-packetcache-ttl=0
-packetcache-servfail-ttl=0
-max-cache-ttl=15
-threads=1
-loglevel=9
-disable-syslog=yes
-log-common-errors=yes
 """
-    _config_template = """
-    """
     _lua_dns_script_file = """
     function preresolve(dq)
       if dq.qname == newDN('toolarge.ecs.') then
diff --git a/regression-tests.recursor-dnssec/test_ExtendedErrors.py b/regression-tests.recursor-dnssec/test_ExtendedErrors.py
index 9ccaa0c5f2..1682644c9e 100644
--- a/regression-tests.recursor-dnssec/test_ExtendedErrors.py
+++ b/regression-tests.recursor-dnssec/test_ExtendedErrors.py
@@ -7,21 +7,10 @@ from recursortests import RecursorTest
 class ExtendedErrorsRecursorTest(RecursorTest):
 
     _confdir = 'ExtendedErrors'
-    _config_template_default = """
+    _config_template = """
 dnssec=validate
-daemon=no
-trace=yes
-packetcache-ttl=0
-packetcache-servfail-ttl=0
-max-cache-ttl=15
-threads=1
-loglevel=9
-disable-syslog=yes
-log-common-errors=yes
+extended-resolution-errors=yes
 """
-    _config_template = """
-    extended-resolution-errors=yes
-    """
     _lua_config_file = """
     rpzFile('configs/%s/zone.rpz', { policyName="zone.rpz.", extendedErrorCode=15, extendedErrorExtra='Blocked by RPZ!'})
     """ % (_confdir)
@@ -219,20 +208,9 @@ log-common-errors=yes
 class NoExtendedErrorsRecursorTest(RecursorTest):
 
     _confdir = 'ExtendedErrorsDisabled'
-    _config_template_default = """
-dnssec=validate
-daemon=no
-trace=yes
-packetcache-ttl=0
-packetcache-servfail-ttl=0
-max-cache-ttl=15
-threads=1
-loglevel=9
-disable-syslog=yes
-log-common-errors=yes
-"""
     _config_template = """
-    extended-resolution-errors=no
+dnssec=validate
+extended-resolution-errors=no
     """
     _roothints = None
 
diff --git a/regression-tests.recursor-dnssec/test_Lua.py b/regression-tests.recursor-dnssec/test_Lua.py
index a0fb67a87d..e5649533d7 100644
--- a/regression-tests.recursor-dnssec/test_Lua.py
+++ b/regression-tests.recursor-dnssec/test_Lua.py
@@ -642,23 +642,13 @@ class PDNSValidationStatesTest(RecursorTest):
     """Tests that we have access to the validation states from Lua"""
 
     _confdir = 'validation-states-from-lua'
-    _config_template_default = """
+    _config_template = """
 dnssec=validate
-daemon=no
-trace=yes
-packetcache-ttl=0
-packetcache-servfail-ttl=0
-max-cache-ttl=15
-threads=1
-loglevel=9
-disable-syslog=yes
-log-common-errors=yes
 """
     _roothints = None
     _lua_config_file = """
     """
-    _config_template = """
-    """
+
     _lua_dns_script_file = """
     function postresolve (dq)
       if pdns.validationstates.Indeterminate == nil or
diff --git a/regression-tests.recursor-dnssec/test_RoutingTag.py b/regression-tests.recursor-dnssec/test_RoutingTag.py
index a6da5bc623..5b7b1b82ff 100644
--- a/regression-tests.recursor-dnssec/test_RoutingTag.py
+++ b/regression-tests.recursor-dnssec/test_RoutingTag.py
@@ -21,7 +21,6 @@ class RoutingTagTest(RecursorTest):
 daemon=no
 trace=yes
 dont-query=
-ecs-add-for=0.0.0.0/0
 local-address=127.0.0.1
 packetcache-ttl=0
 packetcache-servfail-ttl=0
@@ -29,6 +28,9 @@ max-cache-ttl=600
 threads=1
 loglevel=9
 disable-syslog=yes
+log-common-errors=yes
+statistics-interval=0
+ecs-add-for=0.0.0.0/0
 """
 
     def sendECSQuery(self, query, expected, expectedFirstTTL=None):
@@ -107,9 +109,8 @@ class testRoutingTag(RoutingTagTest):
     _confdir = 'RoutingTag'
 
     _config_template = """
-log-common-errors=yes
 use-incoming-edns-subnet=yes
-edns-subnet-whitelist=ecs-echo.example.
+edns-subnet-allow-list=ecs-echo.example.
 forward-zones=ecs-echo.example=%s.24
     """ % (os.environ['PREFIX'])
     _lua_dns_script_file = """
@@ -182,9 +183,8 @@ class testRoutingTagFFI(RoutingTagTest):
     _confdir = 'RoutingTagFFI'
 
     _config_template = """
-log-common-errors=yes
 use-incoming-edns-subnet=yes
-edns-subnet-whitelist=ecs-echo.example.
+edns-subnet-allow-list=ecs-echo.example.
 forward-zones=ecs-echo.example=%s.24
     """ % (os.environ['PREFIX'])
     _lua_dns_script_file = """
-- 
2.47.2