auth-4.8 for regression tests in recursor. updated sdig output format

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 104adde128a1f98cd1c955037405eb7ba35b752f..f2fd15ab0e7d74dff00b1ea0fd00ba3ef1e0243d 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -486,7 +486,7 @@ jobs:
         sanitizers: [ubsan+asan, tsan]
         dist_name: [debian]
         dist_release_name: [bullseye]
-        pdns_repo_version: ['45']
+        pdns_repo_version: ['48']
     container:
       image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master
       env:

diff --git a/regression-tests.recursor/RPZ-Lua/expected_result b/regression-tests.recursor/RPZ-Lua/expected_result
index add98b0fac4af2bdce44fdb069cecb8fe5b1d34a..2ba32c523187987dabf19406ae383de9f93e4458 100644 (file)
--- a/regression-tests.recursor/RPZ-Lua/expected_result
+++ b/regression-tests.recursor/RPZ-Lua/expected_result
@@ -1,10 +1,10 @@
 Reply to question for qname='www3.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www3.example.net.       IN      CNAME   [ttl]   www2.example.net.
-0      www2.example.net.       IN      A       [ttl]   192.0.2.2
+0      www3.example.net.       [ttl]   IN      CNAME   www2.example.net.
+0      www2.example.net.       [ttl]   IN      A       192.0.2.2
 Reply to question for qname='android.marvin.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      android.marvin.example.net.     IN      A       [ttl]   192.0.2.5
+0      android.marvin.example.net.     [ttl]   IN      A       192.0.2.5
 Reply to question for qname='www5.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www5.example.net.       IN      A       [ttl]   192.0.2.25
+0      www5.example.net.       [ttl]   IN      A       192.0.2.25

diff --git a/regression-tests.recursor/RPZ/command b/regression-tests.recursor/RPZ/command
index 2d54e2bcc7d13b77ba214fc62fdb08388c4f649f..a776c7dad1721d15fb45f8ea123cc52fd4a915b2 100755 (executable)
--- a/regression-tests.recursor/RPZ/command
+++ b/regression-tests.recursor/RPZ/command
@@ -21,11 +21,11 @@ $SDIG $nameserver 5301 capped-ttl.example.net a recurse 2>&1
 echo "==> defpol-with-ttl.example.net should use the default policy's TTL and not the zone one"
 $SDIG $nameserver 5301 defpol-with-ttl.example.net a recurse 2>&1
 echo "==> defpol-with-ttl-capped.example.net should use the default policy's TTL, but capped to maxTTL"
-$SDIG $nameserver 5301 defpol-with-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/'
+$SDIG $nameserver 5301 defpol-with-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\t\)\([0-9]\+\)/\115/'
 echo "==> defpol-without-ttl.example.net should use the zone's TTL"
-$SDIG $nameserver 5301 defpol-without-ttl.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/'
+$SDIG $nameserver 5301 defpol-without-ttl.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\t\)\([0-9]\+\)/\115/'
 echo "==> defpol-without-ttl-capped.example.net should use the zone's TTL but capped to maxTTL"
-$SDIG $nameserver 5301 defpol-without-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/'
+$SDIG $nameserver 5301 defpol-without-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\t\)\([0-9]\+\)/\115/'
 echo "==> unsupported.example.net has an unsupported target, should be ignored from the RPZ zone"
 $SDIG $nameserver 5301 unsupported.example.net a recurse 2>&1
 echo "==> unsupported2.example.net has an unsupported target, should be ignored from the RPZ zone"

diff --git a/regression-tests.recursor/RPZ/expected_result b/regression-tests.recursor/RPZ/expected_result
index c8a866e80fe7f7c2a84192dd981266df60d03056..29514fa92972c3a5dab52d8ac5eac77b845bb9bb 100644 (file)
--- a/regression-tests.recursor/RPZ/expected_result
+++ b/regression-tests.recursor/RPZ/expected_result
@@ -7,12 +7,12 @@ Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 ==> srv.arthur.example.net RPZ passthru
 Reply to question for qname='srv.arthur.example.net.', qtype=SRV
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      srv.arthur.example.net. IN      SRV     15      0 100 389 server2.example.net.
+0      srv.arthur.example.net. 15      IN      SRV     0 100 389 server2.example.net.
 ==> www.example.net RPZ local data to www2.example.net
 Reply to question for qname='www.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www.example.net.        IN      CNAME   7200    www2.example.net.
-0      www2.example.net.       IN      A       15      192.0.2.2
+0      www.example.net.        7200    IN      CNAME   www2.example.net.
+0      www2.example.net.       15      IN      A       192.0.2.2
 ==> www4.example.net RPZ IP trigger action, dropped
 ==> trillian.example.net NXDOMAIN
 Reply to question for qname='trillian.example.net.', qtype=A
@@ -20,8 +20,8 @@ Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 ==> www.trillian.example.net has no RPZ policy attached, so lookup should succeed
 Reply to question for qname='www.trillian.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www.trillian.example.net.       IN      CNAME   15      www3.arthur.example.net.
-0      www3.arthur.example.net.        IN      A       15      192.0.2.6
+0      www.trillian.example.net.       15      IN      CNAME   www3.arthur.example.net.
+0      www3.arthur.example.net.        15      IN      A       192.0.2.6
 ==> www.hijackme.example.net is served on ns.hijackme.example.net, which should be NXDOMAIN
 Reply to question for qname='www.hijackme.example.net.', qtype=A
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
@@ -31,42 +31,42 @@ Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 ==> capped-ttl.example.net TTL exceeds the maximum TTL for the zone
 Reply to question for qname='capped-ttl.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      capped-ttl.example.net. IN      A       5       192.0.2.35
+0      capped-ttl.example.net. 5       IN      A       192.0.2.35
 ==> defpol-with-ttl.example.net should use the default policy's TTL and not the zone one
 Reply to question for qname='defpol-with-ttl.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      defpol-with-ttl.example.net.    IN      CNAME   10      default.example.net.
-0      default.example.net.    IN      A       15      192.0.2.42
+0      defpol-with-ttl.example.net.    10      IN      CNAME   default.example.net.
+0      default.example.net.    15      IN      A       192.0.2.42
 ==> defpol-with-ttl-capped.example.net should use the default policy's TTL, but capped to maxTTL
 Reply to question for qname='defpol-with-ttl-capped.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      defpol-with-ttl-capped.example.net.     IN      CNAME   20      default.example.net.
-0      default.example.net.    IN      A       15      192.0.2.42
+0      defpol-with-ttl-capped.example.net.     20      IN      CNAME   default.example.net.
+0      default.example.net.    15      IN      A       192.0.2.42
 ==> defpol-without-ttl.example.net should use the zone's TTL
 Reply to question for qname='defpol-without-ttl.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      defpol-without-ttl.example.net. IN      CNAME   7200    default.example.net.
-0      default.example.net.    IN      A       15      192.0.2.42
+0      defpol-without-ttl.example.net. 7200    IN      CNAME   default.example.net.
+0      default.example.net.    15      IN      A       192.0.2.42
 ==> defpol-without-ttl-capped.example.net should use the zone's TTL but capped to maxTTL
 Reply to question for qname='defpol-without-ttl-capped.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      defpol-without-ttl-capped.example.net.  IN      CNAME   50      default.example.net.
-0      default.example.net.    IN      A       15      192.0.2.42
+0      defpol-without-ttl-capped.example.net.  50      IN      CNAME   default.example.net.
+0      default.example.net.    15      IN      A       192.0.2.42
 ==> unsupported.example.net has an unsupported target, should be ignored from the RPZ zone
 Reply to question for qname='unsupported.example.net.', qtype=A
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-1      example.net.    IN      SOA     15      ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      example.net.    15      IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 ==> unsupported2.example.net has an unsupported target, should be ignored from the RPZ zone
 Reply to question for qname='unsupported2.example.net.', qtype=A
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-1      example.net.    IN      SOA     15      ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      example.net.    15      IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 ==> not-rpz.example.net is _not_ an RPZ target and should be processed
 Reply to question for qname='not-rpz.example.net.', qtype=A
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      not-rpz.example.net.    IN      CNAME   5       rpz-not.com.
-1      .       IN      SOA     15      ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+0      not-rpz.example.net.    5       IN      CNAME   rpz-not.com.
+1      .       15      IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 ==> echo-me.wildcard-target.example.net is an RPZ wildcard target
 Reply to question for qname='echo-me.wildcard-target.example.net.', qtype=A
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      echo-me.wildcard-target.example.net.    IN      CNAME   7200    echo-me.wildcard-target.example.net.walled-garden.example.net.
-1      example.net.    IN      SOA     15      ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+0      echo-me.wildcard-target.example.net.    7200    IN      CNAME   echo-me.wildcard-target.example.net.walled-garden.example.net.
+1      example.net.    15      IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300

diff --git a/regression-tests.recursor/answer-in-local-auth/command b/regression-tests.recursor/answer-in-local-auth/command
index 329992db1e36eb899a9487d717678ab85430b2ef..e08674652b42232a01ae4a247de204b20c7e9ea1 100755 (executable)
--- a/regression-tests.recursor/answer-in-local-auth/command
+++ b/regression-tests.recursor/answer-in-local-auth/command
@@ -1 +1 @@
-cleandig service.box.answer-cname-in-local.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig service.box.answer-cname-in-local.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/answer-in-local-auth/expected_result b/regression-tests.recursor/answer-in-local-auth/expected_result
index a039a015881a619d5cf7f35d94643c2bfea66bfe..bf504b8423de0de9ae1e0502c131215374bde850 100644 (file)
--- a/regression-tests.recursor/answer-in-local-auth/expected_result
+++ b/regression-tests.recursor/answer-in-local-auth/expected_result
@@ -1,5 +1,5 @@
-0      pfs.global.box.answer-cname-in-local.example.net.       IN      CNAME   3600    vip-reunion.pfsbox.answer-cname-in-local.example.net.
-0      service.box.answer-cname-in-local.example.net.  IN      CNAME   3600    pfs.global.box.answer-cname-in-local.example.net.
-0      vip-reunion.pfsbox.answer-cname-in-local.example.net.   IN      A       3600    10.1.1.1
+0      pfs.global.box.answer-cname-in-local.example.net.       3600    IN      CNAME   vip-reunion.pfsbox.answer-cname-in-local.example.net.
+0      service.box.answer-cname-in-local.example.net.  3600    IN      CNAME   pfs.global.box.answer-cname-in-local.example.net.
+0      vip-reunion.pfsbox.answer-cname-in-local.example.net.   3600    IN      A       10.1.1.1
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='service.box.answer-cname-in-local.example.net.', qtype=A

diff --git a/regression-tests.recursor/auth-zone-cname-wildcard/command b/regression-tests.recursor/auth-zone-cname-wildcard/command
index e065224f993067cd631812af879de8b6971f1c22..997e097a25b390802fb20a0353576aa406b8812a 100755 (executable)
--- a/regression-tests.recursor/auth-zone-cname-wildcard/command
+++ b/regression-tests.recursor/auth-zone-cname-wildcard/command
@@ -1,2 +1,2 @@
-cleandig host1.something.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig host1.something.auth-zone.example.net. AAAA | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig host1.something.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig host1.something.auth-zone.example.net. AAAA | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/auth-zone-cname-wildcard/expected_result b/regression-tests.recursor/auth-zone-cname-wildcard/expected_result
index 7789f52444769f4e6eb91e5084efd98579f1f9e2..64c3c63af280650d35bfab3c7abaaf9f3bdb3fb8 100644 (file)
--- a/regression-tests.recursor/auth-zone-cname-wildcard/expected_result
+++ b/regression-tests.recursor/auth-zone-cname-wildcard/expected_result
@@ -1,8 +1,8 @@
-0      host1.auth-zone.example.net.    IN      A       3600    127.0.0.55
-0      host1.something.auth-zone.example.net.  IN      CNAME   3600    host1.auth-zone.example.net.
+0      host1.auth-zone.example.net.    3600    IN      A       127.0.0.55
+0      host1.something.auth-zone.example.net.  3600    IN      CNAME   host1.auth-zone.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host1.something.auth-zone.example.net.', qtype=A
-0      host1.auth-zone.example.net.    IN      AAAA    3600    2001:db8::1:45ba
-0      host1.something.auth-zone.example.net.  IN      CNAME   3600    host1.auth-zone.example.net.
+0      host1.auth-zone.example.net.    3600    IN      AAAA    2001:db8::1:45ba
+0      host1.something.auth-zone.example.net.  3600    IN      CNAME   host1.auth-zone.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host1.something.auth-zone.example.net.', qtype=AAAA

diff --git a/regression-tests.recursor/auth-zone-delegation/command b/regression-tests.recursor/auth-zone-delegation/command
index 96c443eb40d0cfd0c05886555902f7fb02fcbf06..bb1fe28a154b4e9d0f4c26b432683ca5fa9f22cf 100755 (executable)
--- a/regression-tests.recursor/auth-zone-delegation/command
+++ b/regression-tests.recursor/auth-zone-delegation/command
@@ -1,2 +1,2 @@
-cleandig www.france.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig france.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www.france.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig france.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/auth-zone-delegation/expected_result b/regression-tests.recursor/auth-zone-delegation/expected_result
index 2388e911b160f17ee2d052e0c219c814293353f8..6137a36688aacd2ff72e1fc5e57162acb6b86cd9 100644 (file)
--- a/regression-tests.recursor/auth-zone-delegation/expected_result
+++ b/regression-tests.recursor/auth-zone-delegation/expected_result
@@ -1,6 +1,6 @@
-0      www.france.auth-zone.example.net.       IN      A       3600    192.0.2.23
+0      www.france.auth-zone.example.net.       3600    IN      A       192.0.2.23
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.france.auth-zone.example.net.', qtype=A
-0      france.auth-zone.example.net.   IN      A       3600    192.0.2.223
+0      france.auth-zone.example.net.   3600    IN      A       192.0.2.223
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='france.auth-zone.example.net.', qtype=A

diff --git a/regression-tests.recursor/auth-zones/command b/regression-tests.recursor/auth-zones/command
index 46d061e40175c4b4666890505627058e0a65570c..75aa5df105f87c06bd9d5dfeee61faaeae1be2ec 100755 (executable)
--- a/regression-tests.recursor/auth-zones/command
+++ b/regression-tests.recursor/auth-zones/command
@@ -1,7 +1,7 @@
-cleandig host1.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig host1.auth-zone.example.net. AAAA | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig host2.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig host3.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig you-are.wild.auth-zone.example.net. TXT | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig host1.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig host1.auth-zone.example.net. AAAA | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig host2.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig host3.auth-zone.example.net. A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig you-are.wild.auth-zone.example.net. TXT | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 # Non-existing QTYPE at the apex
-cleandig auth-zone.example.net. TXT | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig auth-zone.example.net. TXT | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/auth-zones/expected_result b/regression-tests.recursor/auth-zones/expected_result
index 49b5b5aaad8546a77c00da91b0c8009fe0215198..23d4019cb805bb9cb0d89dc1afb6e2ce2aa4b124 100644 (file)
--- a/regression-tests.recursor/auth-zones/expected_result
+++ b/regression-tests.recursor/auth-zones/expected_result
@@ -1,20 +1,20 @@
-0      host1.auth-zone.example.net.    IN      A       3600    127.0.0.55
+0      host1.auth-zone.example.net.    3600    IN      A       127.0.0.55
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host1.auth-zone.example.net.', qtype=A
-0      host1.auth-zone.example.net.    IN      AAAA    3600    2001:db8::1:45ba
+0      host1.auth-zone.example.net.    3600    IN      AAAA    2001:db8::1:45ba
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host1.auth-zone.example.net.', qtype=AAAA
-0      host1.another-auth-zone.example.net.    IN      A       3600    127.0.0.56
-0      host2.auth-zone.example.net.    IN      CNAME   3600    host1.another-auth-zone.example.net.
+0      host1.another-auth-zone.example.net.    3600    IN      A       127.0.0.56
+0      host2.auth-zone.example.net.    3600    IN      CNAME   host1.another-auth-zone.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host2.auth-zone.example.net.', qtype=A
-0      host1.not-auth-zone.example.net.        IN      A       3600    127.0.0.57
-0      host3.auth-zone.example.net.    IN      CNAME   3600    host1.not-auth-zone.example.net.
+0      host1.not-auth-zone.example.net.        3600    IN      A       127.0.0.57
+0      host3.auth-zone.example.net.    3600    IN      CNAME   host1.not-auth-zone.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='host3.auth-zone.example.net.', qtype=A
-0      you-are.wild.auth-zone.example.net.     IN      TXT     3600    "Hi there!"
+0      you-are.wild.auth-zone.example.net.     3600    IN      TXT     "Hi there!"
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='you-are.wild.auth-zone.example.net.', qtype=TXT
-1      auth-zone.example.net.  IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      auth-zone.example.net.  3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='auth-zone.example.net.', qtype=TXT

diff --git a/regression-tests.recursor/cache-recursorcache-forward/command b/regression-tests.recursor/cache-recursorcache-forward/command
index 59bf9ae79bac51983ac14a9823913cfd0ad69be5..684fd39372897abe4e9b4382689d20d20f0162ec 100755 (executable)
--- a/regression-tests.recursor/cache-recursorcache-forward/command
+++ b/regression-tests.recursor/cache-recursorcache-forward/command
@@ -1,4 +1,4 @@
 #!/bin/bash
 $SDIG $nameserver 5302 www.arthur.example.net a recurse
 sleep 3
-$SDIG $nameserver 5302 www.arthur.example.net a recurse | sed 's/\(.*\tIN\tA\t\)\(11\)/\112/'
+$SDIG $nameserver 5302 www.arthur.example.net a recurse | sed 's/\(.*\t\)\(11\tIN\)/\112\tIN/'

diff --git a/regression-tests.recursor/cache-recursorcache-forward/expected_result b/regression-tests.recursor/cache-recursorcache-forward/expected_result
index 702663ffd5cbc7492f88f0c1f5f369245e2ba8fa..e209d3490141740112d57e2105444d5ca641a3a1 100644 (file)
--- a/regression-tests.recursor/cache-recursorcache-forward/expected_result
+++ b/regression-tests.recursor/cache-recursorcache-forward/expected_result
@@ -1,6 +1,6 @@
 Reply to question for qname='www.arthur.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www.arthur.example.net. IN      A       15      192.0.2.2
+0      www.arthur.example.net. 15      IN      A       192.0.2.2
 Reply to question for qname='www.arthur.example.net.', qtype=A
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
-0      www.arthur.example.net. IN      A       12      192.0.2.2
+0      www.arthur.example.net. 12      IN      A       192.0.2.2

diff --git a/regression-tests.recursor/cname-to-a-nxdomain/command b/regression-tests.recursor/cname-to-a-nxdomain/command
index 9c31250f7b1a9479208ec926580c316313a8117b..577827b4dd5ebdae2d641dc4ecda28904c1bb257 100755 (executable)
--- a/regression-tests.recursor/cname-to-a-nxdomain/command
+++ b/regression-tests.recursor/cname-to-a-nxdomain/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www-a.prefect.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www-a.prefect.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/cname-to-a-nxdomain/expected_result b/regression-tests.recursor/cname-to-a-nxdomain/expected_result
index 33d85eeef8c4058cd8603c79c348e4b782ff5f4c..23550b790ff92d48338aa3cd8098e17e6437c7ae 100644 (file)
--- a/regression-tests.recursor/cname-to-a-nxdomain/expected_result
+++ b/regression-tests.recursor/cname-to-a-nxdomain/expected_result
@@ -1,4 +1,4 @@
-0      www-a.prefect.example.net.      IN      CNAME   3600    www-a-2.prefect.example.net.
-1      prefect.example.net.    IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+0      www-a.prefect.example.net.      3600    IN      CNAME   www-a-2.prefect.example.net.
+1      prefect.example.net.    3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www-a.prefect.example.net.', qtype=A

diff --git a/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/command b/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/command
index b1e93dd588270dbe594094e16a36f7f98ee2d516..a3baa398ea7dcf34d33f7108e65c14076d0fbf99 100755 (executable)
--- a/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/command
+++ b/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www.trillian.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www.trillian.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/expected_result b/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/expected_result
index 490a8a27af3cab51db574146048c498960e1f626..3d98336fea5ec972e063053a0ad621329654190c 100644 (file)
--- a/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/expected_result
+++ b/regression-tests.recursor/cross-zone-cname-bogus-nxdomain/expected_result
@@ -1,4 +1,4 @@
-0      www.trillian.example.net.       IN      CNAME   3600    www3.arthur.example.net.
-0      www3.arthur.example.net.        IN      A       3600    192.0.2.6
+0      www.trillian.example.net.       3600    IN      CNAME   www3.arthur.example.net.
+0      www3.arthur.example.net.        3600    IN      A       192.0.2.6
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.trillian.example.net.', qtype=A

diff --git a/regression-tests.recursor/direct-cname-to-nxdomain/command b/regression-tests.recursor/direct-cname-to-nxdomain/command
index 2fd457d758d4013d8e8e6b0ef92d4ad081190313..0b8d797df093c7e2a629d477401e1309f00fe035 100755 (executable)
--- a/regression-tests.recursor/direct-cname-to-nxdomain/command
+++ b/regression-tests.recursor/direct-cname-to-nxdomain/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www-a.prefect.example.net cname | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www-a.prefect.example.net cname | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/direct-cname-to-nxdomain/expected_result b/regression-tests.recursor/direct-cname-to-nxdomain/expected_result
index a87a800ab13095467d04f61a196f3c9060098739..5aa686b2b05ed10c130f93a9eea16c168210ee30 100644 (file)
--- a/regression-tests.recursor/direct-cname-to-nxdomain/expected_result
+++ b/regression-tests.recursor/direct-cname-to-nxdomain/expected_result
@@ -1,3 +1,3 @@
-0      www-a.prefect.example.net.      IN      CNAME   3600    www-a-2.prefect.example.net.
+0      www-a.prefect.example.net.      3600    IN      CNAME   www-a-2.prefect.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www-a.prefect.example.net.', qtype=CNAME

diff --git a/regression-tests.recursor/direct-cname/command b/regression-tests.recursor/direct-cname/command
index 50f42e7f0eee07e296fb450921c90c52e8c836fb..a0421da98809585ffbed0fba3d0acd82d89a91d5 100755 (executable)
--- a/regression-tests.recursor/direct-cname/command
+++ b/regression-tests.recursor/direct-cname/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www-d.prefect.example.net cname | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www-d.prefect.example.net cname | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/direct-cname/expected_result b/regression-tests.recursor/direct-cname/expected_result
index baa2fb6e5fc6c7ffc1c66c5da3c8e1d62f4adb68..2d1f746335310b980b29f85d4913e9f2402d5705 100644 (file)
--- a/regression-tests.recursor/direct-cname/expected_result
+++ b/regression-tests.recursor/direct-cname/expected_result
@@ -1,3 +1,3 @@
-0      www-d.prefect.example.net.      IN      CNAME   3600    www.arthur.example.net.
+0      www-d.prefect.example.net.      3600    IN      CNAME   www.arthur.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www-d.prefect.example.net.', qtype=CNAME

diff --git a/regression-tests.recursor/ghost-1/command b/regression-tests.recursor/ghost-1/command
index 2cd49ff0b0895d140a84087f949e7d6e87cf9737..91bda25864b0c2d3345ed251d895f3c4febe9b07 100755 (executable)
--- a/regression-tests.recursor/ghost-1/command
+++ b/regression-tests.recursor/ghost-1/command
@@ -1,13 +1,13 @@
 #!/bin/sh
 . vars
 rm -f configs/$PREFIX.17/drop-1
-cleandig a.www.1.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig a.www.1.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 8
 touch configs/$PREFIX.17/drop-1
-cleandig b.www.1.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig b.www.1.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig c.www.1.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig c.www.1.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig d.www.1.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig d.www.1.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig e.www.1.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig e.www.1.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/ghost-1/expected_result b/regression-tests.recursor/ghost-1/expected_result
index 84d79e90935343f62adf90e5f51e87f5ac929410..bc000e8412804af40cb54a21e83b683b9c3e8f5e 100644 (file)
--- a/regression-tests.recursor/ghost-1/expected_result
+++ b/regression-tests.recursor/ghost-1/expected_result
@@ -1,15 +1,15 @@
-0      a.www.1.ghost.example.net.      IN      A       3600    192.0.2.7
+0      a.www.1.ghost.example.net.      3600    IN      A       192.0.2.7
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='a.www.1.ghost.example.net.', qtype=A
-0      b.www.1.ghost.example.net.      IN      A       3600    192.0.2.7
+0      b.www.1.ghost.example.net.      3600    IN      A       192.0.2.7
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='b.www.1.ghost.example.net.', qtype=A
-0      c.www.1.ghost.example.net.      IN      A       3600    192.0.2.7
+0      c.www.1.ghost.example.net.      3600    IN      A       192.0.2.7
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.www.1.ghost.example.net.', qtype=A
-1      ghost.example.net.      IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      ghost.example.net.      3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='d.www.1.ghost.example.net.', qtype=A
-1      ghost.example.net.      IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      ghost.example.net.      3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='e.www.1.ghost.example.net.', qtype=A

diff --git a/regression-tests.recursor/ghost-2/command b/regression-tests.recursor/ghost-2/command
index f22207aed89a6f9bc2ac988d83923f9e55563f61..fb141b093228adc5f7f8c61efaa32da264dd0198 100755 (executable)
--- a/regression-tests.recursor/ghost-2/command
+++ b/regression-tests.recursor/ghost-2/command
@@ -1,13 +1,13 @@
 #!/bin/sh
 . vars
 rm -f configs/$PREFIX.17/drop-2
-cleandig a.www.2.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig a.www.2.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 8
 touch configs/$PREFIX.17/drop-2
-cleandig b.www.2.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig b.www.2.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig c.www.2.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig c.www.2.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig d.www.2.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig d.www.2.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
-cleandig e.www.2.ghost.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig e.www.2.ghost.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/ghost-2/expected_result b/regression-tests.recursor/ghost-2/expected_result
index 58f4b44342ef2c8d020257d63c5029fe616cbffb..7a2e7325d91693592ca94c572c7f552ca2f48b79 100644 (file)
--- a/regression-tests.recursor/ghost-2/expected_result
+++ b/regression-tests.recursor/ghost-2/expected_result
@@ -1,15 +1,15 @@
-0      a.www.2.ghost.example.net.      IN      A       3600    192.0.2.8
+0      a.www.2.ghost.example.net.      3600    IN      A       192.0.2.8
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='a.www.2.ghost.example.net.', qtype=A
-0      b.www.2.ghost.example.net.      IN      A       3600    192.0.2.8
+0      b.www.2.ghost.example.net.      3600    IN      A       192.0.2.8
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='b.www.2.ghost.example.net.', qtype=A
-0      c.www.2.ghost.example.net.      IN      A       3600    192.0.2.8
+0      c.www.2.ghost.example.net.      3600    IN      A       192.0.2.8
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.www.2.ghost.example.net.', qtype=A
-1      ghost.example.net.      IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      ghost.example.net.      3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='d.www.2.ghost.example.net.', qtype=A
-1      ghost.example.net.      IN      SOA     3600    ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
+1      ghost.example.net.      3600    IN      SOA     ns.example.net. hostmaster.example.net. 1 3600 1800 1209600 300
 Rcode: 3 (Non-Existent domain), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='e.www.2.ghost.example.net.', qtype=A

diff --git a/regression-tests.recursor/hijack-1/command b/regression-tests.recursor/hijack-1/command
index 2733d940cf8e1b5a8e708b38eaed718241525cc3..30bfb74c6df86c4aade8e2210ba63d22dfbd7437 100755 (executable)
--- a/regression-tests.recursor/hijack-1/command
+++ b/regression-tests.recursor/hijack-1/command
@@ -1,5 +1,5 @@
 #!/bin/sh
 . vars
-cleandig hijacker.example.net ns | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig www.hijackme.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig hijacker.example.net ns | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig www.hijackme.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
 sleep 5
\ No newline at end of file

diff --git a/regression-tests.recursor/hijack-1/expected_result b/regression-tests.recursor/hijack-1/expected_result
index f5d3502e13b458522ac4dcb77622648dd758f15f..f803316cf1f6c8b9be9aa65c47076b92b55760c9 100644 (file)
--- a/regression-tests.recursor/hijack-1/expected_result
+++ b/regression-tests.recursor/hijack-1/expected_result
@@ -1,6 +1,6 @@
-0      hijacker.example.net.   IN      NS      3600    ns.hijackme.example.net.
+0      hijacker.example.net.   3600    IN      NS      ns.hijackme.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='hijacker.example.net.', qtype=NS
-0      www.hijackme.example.net.       IN      A       3600    192.0.2.20
+0      www.hijackme.example.net.       3600    IN      A       192.0.2.20
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.hijackme.example.net.', qtype=A

diff --git a/regression-tests.recursor/in-zone-cname-bogus-nxdomain/command b/regression-tests.recursor/in-zone-cname-bogus-nxdomain/command
index cb2297357dff343171c06fa684a2b2517e093b61..13c0a3dfa235ef8bd1edd9a9a5a81ced1f9bcfe8 100755 (executable)
--- a/regression-tests.recursor/in-zone-cname-bogus-nxdomain/command
+++ b/regression-tests.recursor/in-zone-cname-bogus-nxdomain/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www.marvin.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www.marvin.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/in-zone-cname-bogus-nxdomain/expected_result b/regression-tests.recursor/in-zone-cname-bogus-nxdomain/expected_result
index 7719481a75a6ee6a0eedc0fa9fdb21d4036e2a2a..0af41f5edcd1704dbc458b7412f5620340e5a993 100644 (file)
--- a/regression-tests.recursor/in-zone-cname-bogus-nxdomain/expected_result
+++ b/regression-tests.recursor/in-zone-cname-bogus-nxdomain/expected_result
@@ -1,4 +1,4 @@
-0      android.marvin.example.net.     IN      A       3600    192.0.2.5
-0      www.marvin.example.net. IN      CNAME   3600    android.marvin.example.net.
+0      android.marvin.example.net.     3600    IN      A       192.0.2.5
+0      www.marvin.example.net. 3600    IN      CNAME   android.marvin.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.marvin.example.net.', qtype=A

diff --git a/regression-tests.recursor/lame-noerror/command b/regression-tests.recursor/lame-noerror/command
index 04e25b154e76189ec615a3355df88febba60c6da..f5ef8a33d845b4e4ee2233bb547e6ed68bfb494a 100755 (executable)
--- a/regression-tests.recursor/lame-noerror/command
+++ b/regression-tests.recursor/lame-noerror/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www.ford.example.net A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www.ford.example.net A | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/simple-a/command b/regression-tests.recursor/simple-a/command
index 8450c9083be273b3ce08278c1c177be66ee0cf76..7956de32336bebe9a1d33d2cf7badbd781334ef5 100755 (executable)
--- a/regression-tests.recursor/simple-a/command
+++ b/regression-tests.recursor/simple-a/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/simple-a/expected_result b/regression-tests.recursor/simple-a/expected_result
index 7e3a2b901f6444eafa45bfe7446909f57f118fb4..640dc00744c7fda3d7bb5df4f1350b0e11b1fecc 100644 (file)
--- a/regression-tests.recursor/simple-a/expected_result
+++ b/regression-tests.recursor/simple-a/expected_result
@@ -1,3 +1,3 @@
-0      www.example.net.        IN      A       3600    192.0.2.1
+0      www.example.net.        3600    IN      A       192.0.2.1
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.example.net.', qtype=A

diff --git a/regression-tests.recursor/simple-cname-to-a/command b/regression-tests.recursor/simple-cname-to-a/command
index b62eeaf9b2242e889153ab679a56e4453d366868..59e7eef2776553bfa0f8a5c587f7c6b683a51e67 100755 (executable)
--- a/regression-tests.recursor/simple-cname-to-a/command
+++ b/regression-tests.recursor/simple-cname-to-a/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig www-d.prefect.example.net a | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig www-d.prefect.example.net a | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/simple-cname-to-a/expected_result b/regression-tests.recursor/simple-cname-to-a/expected_result
index fdf433f3f58578a0f025adf46067e3153a2ba389..3768214482abc47b9cd0c30504dad9aa967d2ee5 100644 (file)
--- a/regression-tests.recursor/simple-cname-to-a/expected_result
+++ b/regression-tests.recursor/simple-cname-to-a/expected_result
@@ -1,4 +1,4 @@
-0      www-d.prefect.example.net.      IN      CNAME   3600    www.arthur.example.net.
-0      www.arthur.example.net. IN      A       3600    192.0.2.2
+0      www-d.prefect.example.net.      3600    IN      CNAME   www.arthur.example.net.
+0      www.arthur.example.net. 3600    IN      A       192.0.2.2
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www-d.prefect.example.net.', qtype=A

diff --git a/regression-tests.recursor/simple-rawtypes/command b/regression-tests.recursor/simple-rawtypes/command
index d5de10e485f9646b54f32889c266febcc15daed2..80a4efdbaa1a8824da8357c24a7de3029ceb7396 100755 (executable)
--- a/regression-tests.recursor/simple-rawtypes/command
+++ b/regression-tests.recursor/simple-rawtypes/command
@@ -1,4 +1,4 @@
 #!/bin/sh
-cleandig srv.arthur.example.net srv | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig rp.arthur.example.net rp | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
-cleandig type1234.arthur.example.net TYPE1234 | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig srv.arthur.example.net srv | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig rp.arthur.example.net rp | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'
+cleandig type1234.arthur.example.net TYPE1234 | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/simple-rawtypes/expected_result b/regression-tests.recursor/simple-rawtypes/expected_result
index 51c0c3ed9ed2b8d674fb813199365732b126504e..5696d8891f3af9abe6a9008e0c8c9a26683297b4 100644 (file)
--- a/regression-tests.recursor/simple-rawtypes/expected_result
+++ b/regression-tests.recursor/simple-rawtypes/expected_result
@@ -1,9 +1,9 @@
-0      srv.arthur.example.net. IN      SRV     3600    0 100 389 server2.example.net.
+0      srv.arthur.example.net. 3600    IN      SRV     0 100 389 server2.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='srv.arthur.example.net.', qtype=SRV
-0      rp.arthur.example.net.  IN      RP      3600    ahu.ds9a.nl. counter.arthur.example.net.
+0      rp.arthur.example.net.  3600    IN      RP      ahu.ds9a.nl. counter.arthur.example.net.
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='rp.arthur.example.net.', qtype=RP
-0      type1234.arthur.example.net.    IN      TYPE1234        3600    \# 2 4142
+0      type1234.arthur.example.net.    3600    IN      TYPE1234        \# 2 4142
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='type1234.arthur.example.net.', qtype=TYPE1234

diff --git a/regression-tests.recursor/truncate-empty/command b/regression-tests.recursor/truncate-empty/command
index 5898ab45dfb305b08d6b0b42bbab077483e72bbf..269f1ab45510f7a7c9219f675611c8f779d5c6c9 100755 (executable)
--- a/regression-tests.recursor/truncate-empty/command
+++ b/regression-tests.recursor/truncate-empty/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig big.arthur.example.net txt | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig big.arthur.example.net txt | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/txt-escaping/command b/regression-tests.recursor/txt-escaping/command
index d12c03b647a9f20c35e1713cd6e46495b42afabf..985842507f72a92dec4bf67dc78186c76fcee661 100755 (executable)
--- a/regression-tests.recursor/txt-escaping/command
+++ b/regression-tests.recursor/txt-escaping/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig weirdtxt.example.net txt | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
+cleandig weirdtxt.example.net txt | sed 's/\(.*\t\)\([0-9]\+\tIN\)/\13600\tIN/'

diff --git a/regression-tests.recursor/txt-escaping/expected_result b/regression-tests.recursor/txt-escaping/expected_result
index 039d2c54e76260171ca16fadbe7ffb5bbfb01c61..b080d5348f417230a167800e9fae055da340ea86 100644 (file)
--- a/regression-tests.recursor/txt-escaping/expected_result
+++ b/regression-tests.recursor/txt-escaping/expected_result
@@ -1,3 +1,3 @@
-0      weirdtxt.example.net.   IN      TXT     3600    "x\014x"
+0      weirdtxt.example.net.   3600    IN      TXT     "x\014x"
 Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='weirdtxt.example.net.', qtype=TXT