From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 21 Jun 2019 08:47:09 +0000 (+0200)
Subject: Fix config template and remove old root trust anchor
X-Git-Tag: dnsdist-1.4.0-rc1~108^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5758%2Fhead;p=thirdparty%2Fpdns.git

Fix config template and remove old root trust anchor
---

diff --git a/regression-tests.recursor-dnssec/test_TrustAnchors.py b/regression-tests.recursor-dnssec/test_TrustAnchors.py
index df61345b39..f44497881a 100644
--- a/regression-tests.recursor-dnssec/test_TrustAnchors.py
+++ b/regression-tests.recursor-dnssec/test_TrustAnchors.py
@@ -10,8 +10,10 @@ class testTrustAnchorsEnabled(RecursorTest):
     _confdir = 'TrustAnchorsEnabled'
     _roothints = None
     _root_DS = None
+    _config_template = """
+     allow-trust-anchor-query=yes
+"""
     _lua_config_file = """
-    allow-trust-anchor-query=yes
 addDS("powerdns.com", "44030 8 1 B763646757DF621DD1204AD3BFA0675B49BE3279")
 addNTA("example")
 addNTA("example.com", "some reason")
@@ -20,7 +22,7 @@ addNTA("example.com", "some reason")
     def testTrustanchorDotServer(self):
         expected = dns.rrset.from_text_list(
             'trustanchor.server.', 86400, dns.rdataclass.CH, 'TXT',
-            ['". 19036 20326"', '"powerdns.com. 44030"'])
+            ['". 20326"', '"powerdns.com. 44030"'])
         query = dns.message.make_query('trustanchor.server', 'TXT',
                                        dns.rdataclass.CH)
         result = self.sendUDPQuery(query)