auth: change sdig output to zonefile order

diff --git a/modules/geoipbackend/regression-tests/apex-record/expected_result b/modules/geoipbackend/regression-tests/apex-record/expected_result
index b1cfab9fdcccbe30f0e37f0bb40d180a3fa3aed9..fb11a75df3b51020178ac769738e4c8f5b3c433f 100644 (file)
--- a/modules/geoipbackend/regression-tests/apex-record/expected_result
+++ b/modules/geoipbackend/regression-tests/apex-record/expected_result
@@ -1,3 +1,3 @@
-0      geo.example.com.        IN      A       30      127.0.0.1
+0      geo.example.com.        30      IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result b/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
index 21713ac15f4f7f2a499c4897db0ede77faa49f00..268c130c64dded907089d093b72d6e480637cd06 100644 (file)
--- a/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
+++ b/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
@@ -1,5 +1,5 @@
-0      www.geo.example.com.    IN      A       30      127.0.0.1
-0      www.geo.example.com.    IN      RRSIG   30      A 13 4 30 [expiry] [inception] [keytag] geo.example.com. ...
-2      .       IN      OPT     32768   
+0      www.geo.example.com.    30      IN      A       127.0.0.1
+0      www.geo.example.com.    30      IN      RRSIG   A 13 4 30 [expiry] [inception] [keytag] geo.example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
index 05838e43b4f26dde4e928ee3df804c5cd9307d04..533e26282d94ddfe0acd58415581f64da9a1edca 100644 (file)
--- a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
-0      www.geo.example.com.    IN      A       30      127.0.0.1
+0      www.geo.example.com.    30      IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/city-resolution/expected_result b/modules/geoipbackend/regression-tests/city-resolution/expected_result
index a6990b5a0b3045cf981a751fd7e1c956bdba2450..d92847daad9ae46061caa198eb6884f851cdee24 100644 (file)
--- a/modules/geoipbackend/regression-tests/city-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/city-resolution/expected_result
@@ -1,12 +1,12 @@
-0      city.geo.example.com.   IN      A       30      127.0.1.1
-2      .       IN      OPT     0       AAgACAABICB/AAAB
+0      city.geo.example.com.   30      IN      A       127.0.1.1
+2      .       0       IN      OPT     AAgACAABICB/AAAB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='city.geo.example.com.', qtype=A
-0      city.geo.example.com.   IN      A       30      127.0.2.1
-2      .       IN      OPT     0       AAgACAABICB/AAAC
+0      city.geo.example.com.   30      IN      A       127.0.2.1
+2      .       0       IN      OPT     AAgACAABICB/AAAC
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='city.geo.example.com.', qtype=A
-0      city.geo.example.com.   IN      A       30      127.0.3.1
-2      .       IN      OPT     0       AAgACAABICB/AAAD
+0      city.geo.example.com.   30      IN      A       127.0.3.1
+2      .       0       IN      OPT     AAgACAABICB/AAAD
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='city.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/custom-mapping-txt-resolution/expected_result b/modules/geoipbackend/regression-tests/custom-mapping-txt-resolution/expected_result
index 2930214ef2789ed5377c7fbf5a8fbcd049da7504..3ab8eb0b651787f619f06385a40e84c2d8bd46bf 100644 (file)
--- a/modules/geoipbackend/regression-tests/custom-mapping-txt-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/custom-mapping-txt-resolution/expected_result
@@ -1,8 +1,8 @@
-0      map.geo.example.com.    IN      TXT     30      "custom mapping"
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      map.geo.example.com.    30      IN      TXT     "custom mapping"
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='map.geo.example.com.', qtype=TXT
-0      map.geo2.example.com.   IN      TXT     30      "overridden moon mapping"
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      map.geo2.example.com.   30      IN      TXT     "overridden moon mapping"
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='map.geo2.example.com.', qtype=TXT

diff --git a/modules/geoipbackend/regression-tests/empty-record-resolution/expected_result b/modules/geoipbackend/regression-tests/empty-record-resolution/expected_result
index f2bbe2acadde45b51f077daeff0467c0df0a50de..216de06f7b416c41c6a754c103539c2193085ecd 100644 (file)
--- a/modules/geoipbackend/regression-tests/empty-record-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/empty-record-resolution/expected_result
@@ -1,8 +1,8 @@
-0      ip.geo.example.com.     IN      A       30      127.0.0.2
-2      .       IN      OPT     0       AAgACAABICB/AAAC
+0      ip.geo.example.com.     30      IN      A       127.0.0.2
+2      .       0       IN      OPT     AAgACAABICB/AAAC
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ip.geo.example.com.', qtype=ANY
-0      ip.geo.example.com.     IN      AAAA    30      ::2
-2      .       IN      OPT     0       AAgAFAACgIAAAAAAAAAAAAAAAAAAAAAC
+0      ip.geo.example.com.     30      IN      AAAA    ::2
+2      .       0       IN      OPT     AAgAFAACgIAAAAAAAAAAAAAAAAAAAAAC
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ip.geo.example.com.', qtype=ANY

diff --git a/modules/geoipbackend/regression-tests/ent-resolution/expected_result b/modules/geoipbackend/regression-tests/ent-resolution/expected_result
index 1c333a888ee1de3577ad6574e77a5081e9ec3ab7..2e6f27135f84f450dfc5fe47bffa82685a0dd390 100644 (file)
--- a/modules/geoipbackend/regression-tests/ent-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/ent-resolution/expected_result
@@ -1,3 +1,3 @@
-1      geo.example.com.        IN      SOA     30      ns1.example.com. hostmaster.example.com. 2014090125 7200 3600 1209600 3600
+1      geo.example.com.        30      IN      SOA     ns1.example.com. hostmaster.example.com. 2014090125 7200 3600 1209600 3600
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='o1.city.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/loc-resolution/expected_result b/modules/geoipbackend/regression-tests/loc-resolution/expected_result
index df1335d2e2b5545673328c09b13d21927b9f0288..bb28a6cc50adbd0742c97dd94232da6626f0b170 100644 (file)
--- a/modules/geoipbackend/regression-tests/loc-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/loc-resolution/expected_result
@@ -1,8 +1,8 @@
-0      loc.geo.example.com.    IN      LOC     30      1 0 0.000 N 1 0 0.000 E 0.00m 1.00m 10000.00m 10.00m
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      loc.geo.example.com.    30      IN      LOC     1 0 0.000 N 1 0 0.000 E 0.00m 1.00m 10000.00m 10.00m
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='loc.geo.example.com.', qtype=LOC
-0      loc.geo.example.com.    IN      TXT     30      "1.000000 1.000000"
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      loc.geo.example.com.    30      IN      TXT     "1.000000 1.000000"
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='loc.geo.example.com.', qtype=TXT

diff --git a/modules/geoipbackend/regression-tests/mixed-weight-resolution/expected_result b/modules/geoipbackend/regression-tests/mixed-weight-resolution/expected_result
index bdd6e61dc9dac3728555c6bec71c502ec8481feb..4c48cb7500ff17a69a2125fcd4f05f72f597956f 100644 (file)
--- a/modules/geoipbackend/regression-tests/mixed-weight-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/mixed-weight-resolution/expected_result
@@ -1,10 +1,10 @@
-0      mixed_weight.geo.example.com.   IN      A       30      127.0.0.1
+0      mixed_weight.geo.example.com.   30      IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='mixed_weight.geo.example.com.', qtype=A
-0      mixed_weight.geo.example.com.   IN      TXT     30      "text"
+0      mixed_weight.geo.example.com.   30      IN      TXT     "text"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='mixed_weight.geo.example.com.', qtype=TXT
-0      mixed_weight.geo.example.com.   IN      A       30      127.0.0.1
-0      mixed_weight.geo.example.com.   IN      TXT     30      "text"
+0      mixed_weight.geo.example.com.   30      IN      A       127.0.0.1
+0      mixed_weight.geo.example.com.   30      IN      TXT     "text"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='mixed_weight.geo.example.com.', qtype=ANY

diff --git a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
index d7847b96428e0dbe950bf6c80356c42bf769c206..6570030066ae7b1ab903186a9ad22ab632778fe4 100644 (file)
--- a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
@@ -1,7 +1,7 @@
-0      geo.example.com.        IN      A       30      127.0.0.1
-0      geo.example.com.        IN      MX      30      10 mx.example.com.
-0      geo.example.com.        IN      NS      30      ns1.example.com.
-0      geo.example.com.        IN      NS      30      ns2.example.com.
-0      geo.example.com.        IN      SOA     30      ns1.example.com. hostmaster.example.com. 2014090125 7200 3600 1209600 3600
+0      geo.example.com.        30      IN      A       127.0.0.1
+0      geo.example.com.        30      IN      MX      10 mx.example.com.
+0      geo.example.com.        30      IN      NS      ns1.example.com.
+0      geo.example.com.        30      IN      NS      ns2.example.com.
+0      geo.example.com.        30      IN      SOA     ns1.example.com. hostmaster.example.com. 2014090125 7200 3600 1209600 3600
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='geo.example.com.', qtype=ANY

diff --git a/modules/lua2backend/regression-tests/basic-a-dnssec/expected_result b/modules/lua2backend/regression-tests/basic-a-dnssec/expected_result
index dad80045c5bb81b9cb77de0225c4ecd9591eb280..e22d3a940ff6b4d7a7c7e6a9f331537ba163b80e 100644 (file)
--- a/modules/lua2backend/regression-tests/basic-a-dnssec/expected_result
+++ b/modules/lua2backend/regression-tests/basic-a-dnssec/expected_result
@@ -1,5 +1,5 @@
-0      www.test.invalid.       IN      A       60      127.0.0.3
-0      www.test.invalid.       IN      RRSIG   60      A 13 3 60 [expiry] [inception] [keytag] test.invalid. ...
-2      .       IN      OPT     32768   
+0      www.test.invalid.       60      IN      A       127.0.0.3
+0      www.test.invalid.       60      IN      RRSIG   A 13 3 60 [expiry] [inception] [keytag] test.invalid. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.test.invalid.', qtype=A

diff --git a/modules/lua2backend/regression-tests/basic-a-resolution/expected_result b/modules/lua2backend/regression-tests/basic-a-resolution/expected_result
index c6d0549c1bf711af153a25f3c134b05bab9a315c..69e60ab3c2f593d5a2379bd5c0355f12f73b3476 100644 (file)
--- a/modules/lua2backend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/lua2backend/regression-tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
-0      www.test.invalid.       IN      A       60      127.0.0.3
+0      www.test.invalid.       60      IN      A       127.0.0.3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.test.invalid.', qtype=A

diff --git a/modules/lua2backend/regression-tests/basic-aaaa-resolution/expected_result b/modules/lua2backend/regression-tests/basic-aaaa-resolution/expected_result
index 2e4ec3c238cc168ab6087592195c483b03236fce..96c7639233cb725a5c1b554c56347d780cccf095 100644 (file)
--- a/modules/lua2backend/regression-tests/basic-aaaa-resolution/expected_result
+++ b/modules/lua2backend/regression-tests/basic-aaaa-resolution/expected_result
@@ -1,3 +1,3 @@
-0      www.test.invalid.       IN      AAAA    60      fe80::3
+0      www.test.invalid.       60      IN      AAAA    fe80::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.test.invalid.', qtype=AAAA

diff --git a/modules/lua2backend/regression-tests/nsec-2-dnssec/expected_result b/modules/lua2backend/regression-tests/nsec-2-dnssec/expected_result
index 4be5b12351309ea84152f306decd3492311ef847..93c37ef9b766cde2a9979663fa8664b5f0b03810 100644 (file)
--- a/modules/lua2backend/regression-tests/nsec-2-dnssec/expected_result
+++ b/modules/lua2backend/regression-tests/nsec-2-dnssec/expected_result
@@ -1,9 +1,9 @@
-1      ns1.test.invalid.       IN      NSEC    4       www.test.invalid. A AAAA RRSIG NSEC
-1      ns1.test.invalid.       IN      RRSIG   4       NSEC 13 3 4 [expiry] [inception] [keytag] test.invalid. ...
-1      test.invalid.   IN      NSEC    4       ns1.test.invalid. NS SOA TXT RRSIG NSEC DNSKEY
-1      test.invalid.   IN      RRSIG   4       NSEC 13 2 4 [expiry] [inception] [keytag] test.invalid. ...
-1      test.invalid.   IN      RRSIG   4       SOA 13 2 60 [expiry] [inception] [keytag] test.invalid. ...
-1      test.invalid.   IN      SOA     4       ns1.test.invalid. root.test.invalid. 20180115 1 2 3 4
-2      .       IN      OPT     32768   
+1      ns1.test.invalid.       4       IN      NSEC    www.test.invalid. A AAAA RRSIG NSEC
+1      ns1.test.invalid.       4       IN      RRSIG   NSEC 13 3 4 [expiry] [inception] [keytag] test.invalid. ...
+1      test.invalid.   4       IN      NSEC    ns1.test.invalid. NS SOA TXT RRSIG NSEC DNSKEY
+1      test.invalid.   4       IN      RRSIG   NSEC 13 2 4 [expiry] [inception] [keytag] test.invalid. ...
+1      test.invalid.   4       IN      RRSIG   SOA 13 2 60 [expiry] [inception] [keytag] test.invalid. ...
+1      test.invalid.   4       IN      SOA     ns1.test.invalid. root.test.invalid. 20180115 1 2 3 4
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='wap.test.invalid.', qtype=A

diff --git a/modules/lua2backend/regression-tests/nsec-dnssec/expected_result b/modules/lua2backend/regression-tests/nsec-dnssec/expected_result
index 1a93837e55d1cc7add07dbfd203769069c095e6e..955e72c1f30d367575667d7f16ad8aa8f75a4363 100644 (file)
--- a/modules/lua2backend/regression-tests/nsec-dnssec/expected_result
+++ b/modules/lua2backend/regression-tests/nsec-dnssec/expected_result
@@ -1,7 +1,7 @@
-1      test.invalid.   IN      NSEC    4       ns1.test.invalid. NS SOA TXT RRSIG NSEC DNSKEY
-1      test.invalid.   IN      RRSIG   4       NSEC 13 2 4 [expiry] [inception] [keytag] test.invalid. ...
-1      test.invalid.   IN      RRSIG   4       SOA 13 2 60 [expiry] [inception] [keytag] test.invalid. ...
-1      test.invalid.   IN      SOA     4       ns1.test.invalid. root.test.invalid. 20180115 1 2 3 4
-2      .       IN      OPT     32768   
+1      test.invalid.   4       IN      NSEC    ns1.test.invalid. NS SOA TXT RRSIG NSEC DNSKEY
+1      test.invalid.   4       IN      RRSIG   NSEC 13 2 4 [expiry] [inception] [keytag] test.invalid. ...
+1      test.invalid.   4       IN      RRSIG   SOA 13 2 60 [expiry] [inception] [keytag] test.invalid. ...
+1      test.invalid.   4       IN      SOA     ns1.test.invalid. root.test.invalid. 20180115 1 2 3 4
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='middle.test.invalid.', qtype=A

diff --git a/modules/remotebackend/regression-tests/apex-test/expected_result b/modules/remotebackend/regression-tests/apex-test/expected_result
index fad201873389c4a5d23e719b720c67f878d77d86..6ae8a5c268b0d3ea63a7c454722a47a3e1b9eb4d 100644 (file)
--- a/modules/remotebackend/regression-tests/apex-test/expected_result
+++ b/modules/remotebackend/regression-tests/apex-test/expected_result
@@ -1,4 +1,4 @@
-0      up.example.com. IN      NS      120     ns1.example.com.
-0      up.example.com. IN      NS      120     ns2.example.com.
+0      up.example.com. 120     IN      NS      ns1.example.com.
+0      up.example.com. 120     IN      NS      ns2.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='up.example.com.', qtype=NS

diff --git a/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result b/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
index 56c44b5317e6edaf90dd782c10b2ebfa35061af0..0e6c2c99ae902b929efa35cfe35604b42598d9b6 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
+++ b/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
@@ -1,5 +1,5 @@
-0      outpost.example.com.    IN      A       120     192.168.2.1
-0      outpost.example.com.    IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      outpost.example.com.    120     IN      A       192.168.2.1
+0      outpost.example.com.    120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/basic-a-resolution/expected_result b/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
index b7318a1274eaaaa25fb05c426eed9934aafeeadb..abe4a12b3f86cd7c75a9fca131ba438cd86ec4e9 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
-0      outpost.example.com.    IN      A       120     192.168.2.1
+0      outpost.example.com.    120     IN      A       192.168.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result b/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
index fcac5c604325564d3da0218e522fbef599ab44e3..c3bfa1e4fbd6dd9ef06fb6551dcd907029ac4bea 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
@@ -1,3 +1,3 @@
-0      outpost.example.com.    IN      AAAA    120     fe80::1
+0      outpost.example.com.    120     IN      AAAA    fe80::1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=AAAA

diff --git a/modules/remotebackend/regression-tests/dnssec-keys/expected_result b/modules/remotebackend/regression-tests/dnssec-keys/expected_result
index bcf7d1d55d2a8330cdacac62ece1346082b47cef..4d66160c0331afa8969f5aebad1504cf570832ed 100644 (file)
--- a/modules/remotebackend/regression-tests/dnssec-keys/expected_result
+++ b/modules/remotebackend/regression-tests/dnssec-keys/expected_result
@@ -1,3 +1,3 @@
-0      example.com.    IN      DNSKEY  120     257 3 13 ...
+0      example.com.    120     IN      DNSKEY  257 3 13 ...
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DNSKEY

diff --git a/modules/remotebackend/regression-tests/long-txt-resolution/expected_result b/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
index 76b71f08b5a511b5436d14fc54e705fbf5937826..2a5d99167f1029ee38c924d4dd6fa320c428b11a 100644 (file)
--- a/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
@@ -1,3 +1,3 @@
-0      jump.up.example.com.    IN      TXT     120     "a very very long indeed text string that should pass out clean and proper thru the entire chain of powerdns processing"
+0      jump.up.example.com.    120     IN      TXT     "a very very long indeed text string that should pass out clean and proper thru the entire chain of powerdns processing"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=TXT

diff --git a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
index fad201873389c4a5d23e719b720c67f878d77d86..6ae8a5c268b0d3ea63a7c454722a47a3e1b9eb4d 100644 (file)
--- a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
+++ b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
@@ -1,4 +1,4 @@
-0      up.example.com. IN      NS      120     ns1.example.com.
-0      up.example.com. IN      NS      120     ns2.example.com.
+0      up.example.com. 120     IN      NS      ns1.example.com.
+0      up.example.com. 120     IN      NS      ns2.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='up.example.com.', qtype=NS

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result b/modules/remotebackend/regression-tests/nsec-middle/expected_result
index 3e0527692ed02b486404b81b74ebeb890d292085..81eb87b0829729607f54b45bb0451408bd62c008 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    120     ns1.example.com. NS SOA RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
-1      ns2.example.com.        IN      NSEC    120     outpost.example.com. A RRSIG NSEC
-1      ns2.example.com.        IN      RRSIG   120     NSEC 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    120     IN      NSEC    ns1.example.com. NS SOA RRSIG NSEC DNSKEY
+1      example.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      SOA     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
+1      ns2.example.com.        120     IN      NSEC    outpost.example.com. A RRSIG NSEC
+1      ns2.example.com.        120     IN      RRSIG   NSEC 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow b/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
index db99bf313ab69d7bb119ead29ff962b188d36a26..09ab427e40fe15ee75a41adcdc9fb47b27970b25 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
@@ -1,7 +1,7 @@
-1      example.com.    IN      NSEC    120     outpost.example.com. NS SOA RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
-2      .       IN      OPT     32768   
+1      example.com.    120     IN      NSEC    outpost.example.com. NS SOA RRSIG NSEC DNSKEY
+1      example.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      SOA     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
index db99bf313ab69d7bb119ead29ff962b188d36a26..09ab427e40fe15ee75a41adcdc9fb47b27970b25 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      example.com.    IN      NSEC    120     outpost.example.com. NS SOA RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
-2      .       IN      OPT     32768   
+1      example.com.    120     IN      NSEC    outpost.example.com. NS SOA RRSIG NSEC DNSKEY
+1      example.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      SOA     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
index 19362ecfbf18b1ec08abef9409ee269a6e6f2231..2ed671beba9d3132dd3814eaa8b06220c5fd619d 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
@@ -1,5 +1,5 @@
-0      jump.up.example.com.    IN      A       120     192.168.3.1
-0      jump.up.example.com.    IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
-2      .       IN      OPT     32768   
+0      jump.up.example.com.    120     IN      A       192.168.3.1
+0      jump.up.example.com.    120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
index e648b1c521845aafbd97b773e322da7711733029..ddf2119715af4a109d3cc72688f6851e9e35fab0 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
@@ -1,6 +1,6 @@
-0      jump.up.example.com.    IN      A       120     192.168.3.1
-0      jump.up.example.com.    IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
-0      jump.up.example.com.    IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
-2      .       IN      OPT     32768   
+0      jump.up.example.com.    120     IN      A       192.168.3.1
+0      jump.up.example.com.    120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
+0      jump.up.example.com.    120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
index e648b1c521845aafbd97b773e322da7711733029..ddf2119715af4a109d3cc72688f6851e9e35fab0 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
@@ -1,6 +1,6 @@
-0      jump.up.example.com.    IN      A       120     192.168.3.1
-0      jump.up.example.com.    IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
-0      jump.up.example.com.    IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
-2      .       IN      OPT     32768   
+0      jump.up.example.com.    120     IN      A       192.168.3.1
+0      jump.up.example.com.    120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
+0      jump.up.example.com.    120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] up.example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
index 0ec92452332918c6d2cb2100052c07ac716bbc6e..8f8eb15c7991428bc7c7b21032ce2df761d02ff8 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      NSEC    120     ns1.example.com. NS SOA RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
-2      .       IN      OPT     32768   
+1      example.com.    120     IN      NSEC    ns1.example.com. NS SOA RRSIG NSEC DNSKEY
+1      example.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      SOA     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
index 7f7f1abe95eb146c0297bde7d53c1157012c806e..accfad51db3ce325c4bc863fa99e1a35b2b9f9c9 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      NSEC3   86400   1 1 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      NSEC3   1 1 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
index 124cc56e92123f782fb1b21efe0f4f9897023572..67b2c1a789920c1c852e8154b9048ece84a8a923 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    120     ns1.example.com. NS SOA RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
-1      www.example.com.        IN      NSEC    120     example.com. A RRSIG NSEC
-1      www.example.com.        IN      RRSIG   120     NSEC 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    120     IN      NSEC    ns1.example.com. NS SOA RRSIG NSEC DNSKEY
+1      example.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    120     IN      SOA     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
+1      www.example.com.        120     IN      NSEC    example.com. A RRSIG NSEC
+1      www.example.com.        120     IN      RRSIG   NSEC 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
index 7f7f1abe95eb146c0297bde7d53c1157012c806e..accfad51db3ce325c4bc863fa99e1a35b2b9f9c9 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      NSEC3   86400   1 1 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      NSEC3   1 1 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc
index 13dcdf057194d9025c1df5826f7af0e2ac2ddd8f..1481e0a608f0b699acd66d1f307d552a757bc2e1 100644 (file)
--- a/pdns/nsec3dig.cc
+++ b/pdns/nsec3dig.cc
@@ -194,8 +194,8 @@ try
       namesseen.insert(DNSName(i->first.d_content->getZoneRepresentation()));
     }
 
-    cout<<i->first.d_place-1<<"\t"<<i->first.d_name.toString()<<"\tIN\t"<<DNSRecordContent::NumberToType(i->first.d_type);
-    cout<<"\t"<<i->first.d_ttl<<"\t"<< i->first.d_content->getZoneRepresentation()<<"\n";
+    cout << i->first.d_place - 1 << "\t" << i->first.d_name.toString() << "\t" << i->first.d_ttl << "\tIN\t" << DNSRecordContent::NumberToType(i->first.d_type);
+    cout << "\t" << i->first.d_content->getZoneRepresentation() << "\n";
   }
 
 #if 0

diff --git a/pdns/sdig.cc b/pdns/sdig.cc
index 917f75038eee1ddaed121bb09a4428bf97bc4296..9f92b2ee348ccef8ae82dbabb60ff0e68dfeefb0 100644 (file)
--- a/pdns/sdig.cc
+++ b/pdns/sdig.cc
@@ -121,7 +121,7 @@ static void printReply(const string& reply, bool showflags, bool hidesoadetails,
   for (MOADNSParser::answers_t::const_iterator i = mdp.d_answers.begin();
        i != mdp.d_answers.end(); ++i) {
     cout << i->first.d_place - 1 << "\t" << i->first.d_name.toString() << "\t"
-         << nameForClass(i->first.d_class, i->first.d_type) << "\t"
+         << ttl(i->first.d_ttl) << "\t" << nameForClass(i->first.d_class, i->first.d_type) << "\t"
          << DNSRecordContent::NumberToType(i->first.d_type);
     if (dumpluaraw) {
       cout<<"\t"<< makeLuaString(i->first.d_content->serialize(DNSName(), true))<<endl;
@@ -132,7 +132,7 @@ static void printReply(const string& reply, bool showflags, bool hidesoadetails,
         string zoneRep = i->first.d_content->getZoneRepresentation();
         vector<string> parts;
         stringtok(parts, zoneRep);
-        cout << "\t" << ttl(i->first.d_ttl) << "\t" << parts[0] << " "
+        cout << "\t" << parts[0] << " "
              << parts[1] << " " << parts[2] << " " << parts[3]
              << " [expiry] [inception] [keytag] " << parts[7] << " ...\n";
         continue;
@@ -141,7 +141,7 @@ static void printReply(const string& reply, bool showflags, bool hidesoadetails,
         string zoneRep = i->first.d_content->getZoneRepresentation();
         vector<string> parts;
         stringtok(parts, zoneRep);
-        cout << "\t" << ttl(i->first.d_ttl) << "\t" << parts[0] << " [flags] "
+        cout << "\t" << parts[0] << " [flags] "
              << parts[2] << " " << parts[3] << " " << parts[4];
         for (vector<string>::iterator iter = parts.begin() + 5;
              iter != parts.end(); ++iter)
@@ -153,7 +153,7 @@ static void printReply(const string& reply, bool showflags, bool hidesoadetails,
         string zoneRep = i->first.d_content->getZoneRepresentation();
         vector<string> parts;
         stringtok(parts, zoneRep);
-        cout << "\t" << ttl(i->first.d_ttl) << "\t" << parts[0] << " "
+        cout << "\t" << parts[0] << " "
              << parts[1] << " " << parts[2] << " ...\n";
         continue;
       }
@@ -161,14 +161,13 @@ static void printReply(const string& reply, bool showflags, bool hidesoadetails,
         string zoneRep = i->first.d_content->getZoneRepresentation();
         vector<string> parts;
         stringtok(parts, zoneRep);
-        cout << "\t" << ttl(i->first.d_ttl) << "\t" << parts[0] << " "
+        cout << "\t" << parts[0] << " "
              << parts[1] << " [serial] " << parts[3] << " " << parts[4] << " "
              << parts[5] << " " << parts[6] << "\n";
         continue;
       }
     }
-    cout << "\t" << ttl(i->first.d_ttl) << "\t"
-         << i->first.d_content->getZoneRepresentation() << "\n";
+    cout << "\t" << i->first.d_content->getZoneRepresentation() << "\n";
   }
 
   EDNSOpts edo;

diff --git a/regression-tests.nobackend/default-publish-cds/expected_result b/regression-tests.nobackend/default-publish-cds/expected_result
index cfbd4b0c11a039c83c369162bb0a251251a6765e..540abe8081d0b1c859378309608e7d3a550c896d 100644 (file)
--- a/regression-tests.nobackend/default-publish-cds/expected_result
+++ b/regression-tests.nobackend/default-publish-cds/expected_result
@@ -1,9 +1,9 @@
 1
 2
-0      minimal.com.    IN      CDS     86400   19988 13 4 b6c8e1ae21490b6a8cdf999383247214490a0b501cad0da434940fa61e2532325bee9b3db253905ecb37614cc6058005
-0      minimal.com.    IN      CDS     86400   44631 13 4 1a7a856b72dab4cd8d2173319574e36a91040eff134f6613e0699229013766ea57ffe5720260d5b2da2b1ab19b6bc216
-0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-2      .       IN      OPT     32768   
+0      minimal.com.    86400   IN      CDS     19988 13 4 b6c8e1ae21490b6a8cdf999383247214490a0b501cad0da434940fa61e2532325bee9b3db253905ecb37614cc6058005
+0      minimal.com.    86400   IN      CDS     44631 13 4 1a7a856b72dab4cd8d2173319574e36a91040eff134f6613e0699229013766ea57ffe5720260d5b2da2b1ab19b6bc216
+0      minimal.com.    86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
 minimal.com.   120     IN      NS      ns1.example.com.
@@ -20,17 +20,17 @@ minimal.com.        86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
 minimal.com.   86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-0      minimal.com.    IN      CDS     86400   19988 13 1 99173ff8dd534e1e9092572d4008ccb9381424b3
-0      minimal.com.    IN      CDS     86400   19988 13 2 f317da762321935edfca118cd5dac67b8ef5d8826f63c4399ddf7fbe2415734e
-0      minimal.com.    IN      CDS     86400   44631 13 1 c7e816f8e73d4a4a3b8d06d7376833d525bdd7db
-0      minimal.com.    IN      CDS     86400   44631 13 2 25b688fbaf349a706bf0d8b02ac858f0567cf601ca1a9d7f34bb08c43928093e
-0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-2      .       IN      OPT     32768   
+0      minimal.com.    86400   IN      CDS     19988 13 1 99173ff8dd534e1e9092572d4008ccb9381424b3
+0      minimal.com.    86400   IN      CDS     19988 13 2 f317da762321935edfca118cd5dac67b8ef5d8826f63c4399ddf7fbe2415734e
+0      minimal.com.    86400   IN      CDS     44631 13 1 c7e816f8e73d4a4a3b8d06d7376833d525bdd7db
+0      minimal.com.    86400   IN      CDS     44631 13 2 25b688fbaf349a706bf0d8b02ac858f0567cf601ca1a9d7f34bb08c43928093e
+0      minimal.com.    86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
-0      minimal.com.    IN      CDS     86400   0 0 0 00
-0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-2      .       IN      OPT     32768   
+0      minimal.com.    86400   IN      CDS     0 0 0 00
+0      minimal.com.    86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
 minimal.com.   120     IN      NS      ns1.example.com.
@@ -46,11 +46,11 @@ minimal.com.        86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
 minimal.com.   86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-1      minimal.com.    IN      NSEC    120     minimal.com. NS SOA RRSIG NSEC DNSKEY
-1      minimal.com.    IN      RRSIG   120     NSEC 13 2 120 [expiry] [inception] [keytag] minimal.com. ...
-1      minimal.com.    IN      RRSIG   120     SOA 13 2 120 [expiry] [inception] [keytag] minimal.com. ...
-1      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      minimal.com.    120     IN      NSEC    minimal.com. NS SOA RRSIG NSEC DNSKEY
+1      minimal.com.    120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] minimal.com. ...
+1      minimal.com.    120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] minimal.com. ...
+1      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
 minimal.com.   120     IN      NS      ns1.example.com.
@@ -64,10 +64,10 @@ minimal.com.        120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-0      minimal.com.    IN      CDS     86400   19988 13 4 b6c8e1ae21490b6a8cdf999383247214490a0b501cad0da434940fa61e2532325bee9b3db253905ecb37614cc6058005
-0      minimal.com.    IN      CDS     86400   44631 13 4 1a7a856b72dab4cd8d2173319574e36a91040eff134f6613e0699229013766ea57ffe5720260d5b2da2b1ab19b6bc216
-0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
-2      .       IN      OPT     32768   
+0      minimal.com.    86400   IN      CDS     19988 13 4 b6c8e1ae21490b6a8cdf999383247214490a0b501cad0da434940fa61e2532325bee9b3db253905ecb37614cc6058005
+0      minimal.com.    86400   IN      CDS     44631 13 4 1a7a856b72dab4cd8d2173319574e36a91040eff134f6613e0699229013766ea57ffe5720260d5b2da2b1ab19b6bc216
+0      minimal.com.    86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
 minimal.com.   120     IN      NS      ns1.example.com.

diff --git a/regression-tests.nobackend/distributor/expected_result b/regression-tests.nobackend/distributor/expected_result
index 0271c8c0de76d7a651e5831a55d2d5ebb5cf68e3..e90206c6e938100b0d455bf27b584ed1693596b7 100644 (file)
--- a/regression-tests.nobackend/distributor/expected_result
+++ b/regression-tests.nobackend/distributor/expected_result
@@ -1,4 +1,4 @@
 had non-zero drops
 Reply to question for qname='example.com.', qtype=A
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-1      example.com.    IN      SOA     3600    ahu.example.com. ns1.example.com. 2008080300 1800 3600 604800 3600
+1      example.com.    3600    IN      SOA     ahu.example.com. ns1.example.com. 2008080300 1800 3600 604800 3600

diff --git a/regression-tests.nobackend/edns-packet-cache/expected_result b/regression-tests.nobackend/edns-packet-cache/expected_result
index c6fd746bcb836f4a9c5aa8c3783b3b44e98f9dff..46db7ad5a14accecba528fd4523c6d3cad5cbab3 100644 (file)
--- a/regression-tests.nobackend/edns-packet-cache/expected_result
+++ b/regression-tests.nobackend/edns-packet-cache/expected_result
@@ -1,16 +1,16 @@
-0      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+0      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=SOA
-0      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-2      .       IN      OPT     0       
+0      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+2      .       0       IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=SOA
-0      minimal.com.    IN      NS      120     ns1.example.com.
-0      minimal.com.    IN      NS      120     ns2.example.com.
-2      .       IN      OPT     0       
+0      minimal.com.    120     IN      NS      ns1.example.com.
+0      minimal.com.    120     IN      NS      ns2.example.com.
+2      .       0       IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=NS
-0      minimal.com.    IN      NS      120     ns1.example.com.
-0      minimal.com.    IN      NS      120     ns2.example.com.
+0      minimal.com.    120     IN      NS      ns1.example.com.
+0      minimal.com.    120     IN      NS      ns2.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=NS

diff --git a/regression-tests.nobackend/negcache-tests-dotted-cname/expected_result b/regression-tests.nobackend/negcache-tests-dotted-cname/expected_result
index b0a962af875c293985e4bba37c3237ed13743c90..cd1779cba2bd360be3ccfb29582db03055cb7940 100644 (file)
--- a/regression-tests.nobackend/negcache-tests-dotted-cname/expected_result
+++ b/regression-tests.nobackend/negcache-tests-dotted-cname/expected_result
@@ -1,7 +1,7 @@
-0      cname.example2.com.     IN      CNAME   3600    www.example.com.
-0      www.example.com.        IN      A       120     127.0.0.1
+0      cname.example2.com.     3600    IN      CNAME   www.example.com.
+0      www.example.com.        120     IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname.example2.com.', qtype=A
-0      www.example.com.        IN      A       120     127.0.0.1
+0      www.example.com.        120     IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.example.com.', qtype=A

diff --git a/regression-tests.nobackend/soa-edit/expected_result b/regression-tests.nobackend/soa-edit/expected_result
index 7f9d928e23af1f8051c491436a87a34bc73ba9a2..8fcb78bd54dc8a731225fa688486365e9251c423 100644 (file)
--- a/regression-tests.nobackend/soa-edit/expected_result
+++ b/regression-tests.nobackend/soa-edit/expected_result
@@ -1,20 +1,20 @@
 Set 'minimal.com' meta SOA-EDIT = INCREMENT-WEEKS
-0      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
+0      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=SOA
-1      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
+1      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=MX
-1      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
+1      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083846 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx.minimal.com.', qtype=MX
 midnight has passed
-0      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
+0      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=SOA
-1      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
+1      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=MX
-1      minimal.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
+1      minimal.com.    120     IN      SOA     ns1.example.com. ahu.example.com. 2000083847 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx.minimal.com.', qtype=MX

diff --git a/regression-tests.rootzone/tests/direct-ds/expected_result b/regression-tests.rootzone/tests/direct-ds/expected_result
index 8d454a0989c3eafa347aa855e9527e40fb15b349..c40ee802f566e447b6b39b1068cf244a14781d03 100644 (file)
--- a/regression-tests.rootzone/tests/direct-ds/expected_result
+++ b/regression-tests.rootzone/tests/direct-ds/expected_result
@@ -1,4 +1,4 @@
-0      net.    IN      DS      86400   35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
-2      .       IN      OPT     32768   
+0      net.    86400   IN      DS      35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='net.', qtype=DS

diff --git a/regression-tests.rootzone/tests/direct-ds/expected_result.dnssec b/regression-tests.rootzone/tests/direct-ds/expected_result.dnssec
index 3b95c8b98e3c4687ee9eeb14237f80a981614c89..445bc1250864e67ab0eafbf80885cbbb965d5504 100644 (file)
--- a/regression-tests.rootzone/tests/direct-ds/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/direct-ds/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      net.    IN      DS      86400   35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
-0      net.    IN      RRSIG   86400   DS 13 1 86400 [expiry] [inception] [keytag] . ...
-2      .       IN      OPT     32768   
+0      net.    86400   IN      DS      35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
+0      net.    86400   IN      RRSIG   DS 13 1 86400 [expiry] [inception] [keytag] . ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='net.', qtype=DS

diff --git a/regression-tests.rootzone/tests/direct-ns/expected_result b/regression-tests.rootzone/tests/direct-ns/expected_result
index e8cd4fe499af1e40b4545675883184fcc033666b..0118e37872b738dc646671d0daae10a4e1fe61d1 100644 (file)
--- a/regression-tests.rootzone/tests/direct-ns/expected_result
+++ b/regression-tests.rootzone/tests/direct-ns/expected_result
@@ -1,6 +1,6 @@
-1      net.    IN      NS      172800  a.gtld-servers.net.
-2      .       IN      OPT     32768   
-2      a.gtld-servers.net.     IN      A       172800  192.5.6.30
-2      a.gtld-servers.net.     IN      AAAA    172800  2001:503:a83e::2:30
+1      net.    172800  IN      NS      a.gtld-servers.net.
+2      .       32768   IN      OPT     
+2      a.gtld-servers.net.     172800  IN      A       192.5.6.30
+2      a.gtld-servers.net.     172800  IN      AAAA    2001:503:a83e::2:30
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='net.', qtype=NS

diff --git a/regression-tests.rootzone/tests/direct-ns/expected_result.dnssec b/regression-tests.rootzone/tests/direct-ns/expected_result.dnssec
index 34b452e7499fe6931a9ff6d6c5fbdd824609a8f4..0a1e68a10f3a4d1bc9cfcc6410a51d2c4149d620 100644 (file)
--- a/regression-tests.rootzone/tests/direct-ns/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/direct-ns/expected_result.dnssec
@@ -1,8 +1,8 @@
-1      net.    IN      DS      86400   35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
-1      net.    IN      NS      172800  a.gtld-servers.net.
-1      net.    IN      RRSIG   86400   DS 13 1 86400 [expiry] [inception] [keytag] . ...
-2      .       IN      OPT     32768   
-2      a.gtld-servers.net.     IN      A       172800  192.5.6.30
-2      a.gtld-servers.net.     IN      AAAA    172800  2001:503:a83e::2:30
+1      net.    172800  IN      NS      a.gtld-servers.net.
+1      net.    86400   IN      DS      35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
+1      net.    86400   IN      RRSIG   DS 13 1 86400 [expiry] [inception] [keytag] . ...
+2      .       32768   IN      OPT     
+2      a.gtld-servers.net.     172800  IN      A       192.5.6.30
+2      a.gtld-servers.net.     172800  IN      AAAA    2001:503:a83e::2:30
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='net.', qtype=NS

diff --git a/regression-tests.rootzone/tests/direct-root/expected_result b/regression-tests.rootzone/tests/direct-root/expected_result
index 7f0ccacb4b821ca6a5c210fa0b0812c0e127d7c6..7dd425415e45943359ac6bec256e954b02a95607 100644 (file)
--- a/regression-tests.rootzone/tests/direct-root/expected_result
+++ b/regression-tests.rootzone/tests/direct-root/expected_result
@@ -1,5 +1,5 @@
-0      .       IN      NS      518400  a.root-servers.net.
-2      a.root-servers.net.     IN      A       518400  198.41.0.4
-2      a.root-servers.net.     IN      AAAA    518400  2001:503:ba3e::2:30
+0      .       518400  IN      NS      a.root-servers.net.
+2      a.root-servers.net.     518400  IN      A       198.41.0.4
+2      a.root-servers.net.     518400  IN      AAAA    2001:503:ba3e::2:30
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='.', qtype=NS

diff --git a/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result b/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result
index c6b505054f7dc6b2a44ae5d2a348c96486bd2949..f362c5a21f8eae6e3fd9cd420059a5ee08eb7a61 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result
+++ b/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result
@@ -1,5 +1,5 @@
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result.dnssec b/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result.dnssec
index f714a769c8f374ea14e4a7113a5ded831a1e86c1..6fed85b3b1ebb5cdec88976b142eeb595807697a 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/ds-at-ent-from-glue/expected_result.dnssec
@@ -1,6 +1,6 @@
-1      uk.     IN      DS      86400   43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+1      uk.     86400   IN      DS      43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/ds-at-ent/expected_result b/regression-tests.rootzone/tests/ds-at-ent/expected_result
index c6b505054f7dc6b2a44ae5d2a348c96486bd2949..f362c5a21f8eae6e3fd9cd420059a5ee08eb7a61 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-ent/expected_result
+++ b/regression-tests.rootzone/tests/ds-at-ent/expected_result
@@ -1,5 +1,5 @@
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/ds-at-ent/expected_result.dnssec b/regression-tests.rootzone/tests/ds-at-ent/expected_result.dnssec
index f714a769c8f374ea14e4a7113a5ded831a1e86c1..6fed85b3b1ebb5cdec88976b142eeb595807697a 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-ent/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/ds-at-ent/expected_result.dnssec
@@ -1,6 +1,6 @@
-1      uk.     IN      DS      86400   43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+1      uk.     86400   IN      DS      43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/ds-at-glue/expected_result b/regression-tests.rootzone/tests/ds-at-glue/expected_result
index 8bff8257849d4154451ec15f2acd93d67cb9a9b3..907c5c0986c87e476a8b0e7eab5e63bfee2ce2e6 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-glue/expected_result
+++ b/regression-tests.rootzone/tests/ds-at-glue/expected_result
@@ -1,5 +1,5 @@
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='barney.advsys.co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/ds-at-glue/expected_result.dnssec b/regression-tests.rootzone/tests/ds-at-glue/expected_result.dnssec
index 07271b403738dfe78b56cae4c1277532fba5fc3d..febe97a6a3959c7379323688a94d7a051431db1c 100644 (file)
--- a/regression-tests.rootzone/tests/ds-at-glue/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/ds-at-glue/expected_result.dnssec
@@ -1,6 +1,6 @@
-1      uk.     IN      DS      86400   43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
-1      uk.     IN      NS      172800  nsa.nic.uk.
-2      nsa.nic.uk.     IN      A       172800  156.154.100.3
-2      nsa.nic.uk.     IN      AAAA    172800  2001:502:ad09::3
+1      uk.     172800  IN      NS      nsa.nic.uk.
+1      uk.     86400   IN      DS      43876 8 2 a107ed2ac1bd14d924173bc7e827a1153582072394f9272ba37e2353bc659603
+2      nsa.nic.uk.     172800  IN      A       156.154.100.3
+2      nsa.nic.uk.     172800  IN      AAAA    2001:502:ad09::3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='barney.advsys.co.uk.', qtype=DS

diff --git a/regression-tests.rootzone/tests/nx-2ld/expected_result b/regression-tests.rootzone/tests/nx-2ld/expected_result
index 270b1028e9cce570113fabecf038e2b37e056ffe..63f7999854c5146161e7ad8b8a9c9556f93d8b92 100644 (file)
--- a/regression-tests.rootzone/tests/nx-2ld/expected_result
+++ b/regression-tests.rootzone/tests/nx-2ld/expected_result
@@ -1,3 +1,3 @@
-1      .       IN      SOA     86400   a.root-servers.net. nstld.verisign-grs.com. 2016021600 1800 900 604800 86400
+1      .       86400   IN      SOA     a.root-servers.net. nstld.verisign-grs.com. 2016021600 1800 900 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='com.', qtype=NS

diff --git a/regression-tests.rootzone/tests/ref-3ld/expected_result b/regression-tests.rootzone/tests/ref-3ld/expected_result
index 87f4a76710279ab9a846a7130f0e5e41d0da356c..862272b24dc882487bae4f105cd92df0c24ee417 100644 (file)
--- a/regression-tests.rootzone/tests/ref-3ld/expected_result
+++ b/regression-tests.rootzone/tests/ref-3ld/expected_result
@@ -1,6 +1,6 @@
-1      net.    IN      NS      172800  a.gtld-servers.net.
-2      .       IN      OPT     32768   
-2      a.gtld-servers.net.     IN      A       172800  192.5.6.30
-2      a.gtld-servers.net.     IN      AAAA    172800  2001:503:a83e::2:30
+1      net.    172800  IN      NS      a.gtld-servers.net.
+2      .       32768   IN      OPT     
+2      a.gtld-servers.net.     172800  IN      A       192.5.6.30
+2      a.gtld-servers.net.     172800  IN      AAAA    2001:503:a83e::2:30
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='some-host.domain.net.', qtype=A

diff --git a/regression-tests.rootzone/tests/ref-3ld/expected_result.dnssec b/regression-tests.rootzone/tests/ref-3ld/expected_result.dnssec
index abd2224cebd06d9bf740f627e1bb6da106bbd262..32c9d2702980bbd9f451f699907935dea409d56d 100644 (file)
--- a/regression-tests.rootzone/tests/ref-3ld/expected_result.dnssec
+++ b/regression-tests.rootzone/tests/ref-3ld/expected_result.dnssec
@@ -1,8 +1,8 @@
-1      net.    IN      DS      86400   35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
-1      net.    IN      NS      172800  a.gtld-servers.net.
-1      net.    IN      RRSIG   86400   DS 13 1 86400 [expiry] [inception] [keytag] . ...
-2      .       IN      OPT     32768   
-2      a.gtld-servers.net.     IN      A       172800  192.5.6.30
-2      a.gtld-servers.net.     IN      AAAA    172800  2001:503:a83e::2:30
+1      net.    172800  IN      NS      a.gtld-servers.net.
+1      net.    86400   IN      DS      35886 8 2 7862b27f5f516ebe19680444d4ce5e762981931842c465f00236401d8bd973ee
+1      net.    86400   IN      RRSIG   DS 13 1 86400 [expiry] [inception] [keytag] . ...
+2      .       32768   IN      OPT     
+2      a.gtld-servers.net.     172800  IN      A       192.5.6.30
+2      a.gtld-servers.net.     172800  IN      AAAA    2001:503:a83e::2:30
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='some-host.domain.net.', qtype=A

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index 876edaeb38326c2030034edce27904ec27467d6c..a88db8f2d1e0b46dbf662b9ea3f453f89eb85857 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -78,20 +78,20 @@ custom_mapping:
   $geoipregion: earth
 EOF
                cat > $testsdir/region-a-resolution/expected_result <<EOF
-0      www.geo.example.com.    IN      A       30      $geoipregionip
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      www.geo.example.com.    30      IN      A       $geoipregionip
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A
 EOF
                 cat > $testsdir/region-cname-resolution/expected_result <<EOF
-0      indirect.geo.example.com.       IN      CNAME   30      $geoipregion.elsewhere.example.com.
-2      .       IN      OPT     0       AAgACAABIBgBAQEB
+0      indirect.geo.example.com.       30      IN      CNAME   $geoipregion.elsewhere.example.com.
+2      .       0       IN      OPT     AAgACAABIBgBAQEB
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='indirect.geo.example.com.', qtype=A
 EOF
                 cat > $testsdir/text-interpolation/expected_result <<EOF
-0      continent.geo.example.com.      IN      TXT     30      "Your continent is na"
-2      .       IN      OPT     0       AAgACAABIBgBAgME
+0      continent.geo.example.com.      30      IN      TXT     "Your continent is na"
+2      .       0       IN      OPT     AAgACAABIBgBAgME
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='continent.geo.example.com.', qtype=TXT
 EOF

diff --git a/regression-tests/tests/0dyndns-prereq-all/expected_result b/regression-tests/tests/0dyndns-prereq-all/expected_result
index c30991725bc0a89ae19a7a6ae74fde09622e0ffa..848392213b81c4922721603180bb3f6a884f7c71 100644 (file)
--- a/regression-tests/tests/0dyndns-prereq-all/expected_result
+++ b/regression-tests/tests/0dyndns-prereq-all/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-255.test.dyndns.', qtype=ANY
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      host-1.test.dyndns.     IN      A       3600    127.0.0.101
+0      host-1.test.dyndns.     3600    IN      A       127.0.0.101
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1.test.dyndns.', qtype=ANY
 Answer:
@@ -16,10 +16,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      host-1.test.dyndns.     IN      A       3600    127.0.0.101
+0      host-1.test.dyndns.     3600    IN      A       127.0.0.101
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1.test.dyndns.', qtype=A
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:
@@ -28,7 +28,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:
@@ -37,7 +37,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:

diff --git a/regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result b/regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result
index d60d96e51291089eed60596269b5e07ac2046275..cc8dfbac36ffacdada0084013faf05bdce8f1545 100644 (file)
--- a/regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result
+++ b/regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result
@@ -1,6 +1,6 @@
-0      multi.test.dyndns.      IN      A       3600    127.0.0.1
-0      multi.test.dyndns.      IN      A       3600    127.0.0.2
-0      multi.test.dyndns.      IN      A       3600    127.0.0.3
+0      multi.test.dyndns.      3600    IN      A       127.0.0.1
+0      multi.test.dyndns.      3600    IN      A       127.0.0.2
+0      multi.test.dyndns.      3600    IN      A       127.0.0.3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='multi.test.dyndns.', qtype=ANY
 Answer:

diff --git a/regression-tests/tests/1dyndns-cname-and-other-data/expected_result b/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
index 371bdf9fdecf625e3b039fd9b98832b62bea7253..1161f4a3c9682c3ccc360b8cacce372e0384f4ca 100644 (file)
--- a/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
+++ b/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
@@ -1,5 +1,5 @@
 * Check if there is nothing there
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=ANY
 * Try to add 2 records that are not allowed together (should lead to FORMERR)
@@ -10,10 +10,10 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 * check that indeed nothing was added
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=CNAME
 * Add a record that will result in an ENT being inserted at the upcoming CNAME
@@ -45,7 +45,7 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 * Check that we only still have the CNAME
-0      cname-and-other.test.dyndns.    IN      CNAME   3600    powerdns-cname.example.
+0      cname-and-other.test.dyndns.    3600    IN      CNAME   powerdns-cname.example.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=A
 * Delete the CNAME and add the A record in one go
@@ -56,10 +56,10 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 * Check that we have only the A-record
-0      cname-and-other.test.dyndns.    IN      A       3600    192.0.2.1
+0      cname-and-other.test.dyndns.    3600    IN      A       192.0.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=CNAME
 * Attempt to add a CNAME (should be REFUSED)
@@ -70,7 +70,7 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 * check that we have only the A-record
-0      cname-and-other.test.dyndns.    IN      A       3600    192.0.2.1
+0      cname-and-other.test.dyndns.    3600    IN      A       192.0.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=ANY
 * Clean up

diff --git a/regression-tests/tests/1dyndns-content-casemix/expected_result b/regression-tests/tests/1dyndns-content-casemix/expected_result
index 4ed8fac755900d9a4f94119774d4a148c24b3364..ed67693edeba34dda30022deeedb8ef59da6eda7 100644 (file)
--- a/regression-tests/tests/1dyndns-content-casemix/expected_result
+++ b/regression-tests/tests/1dyndns-content-casemix/expected_result
@@ -11,7 +11,7 @@ Answer:
 
 
 == Verify PTR presence
-0      ptr1.test.dyndns.       IN      PTR     3600    host-2.test.dyndns.
+0      ptr1.test.dyndns.       3600    IN      PTR     host-2.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ptr1.test.dyndns.', qtype=PTR
 
@@ -24,7 +24,7 @@ Answer:
 
 
 == Verify that we have one PTR
-0      ptr1.test.dyndns.       IN      PTR     3600    host-2.test.dyndns.
+0      ptr1.test.dyndns.       3600    IN      PTR     host-2.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ptr1.test.dyndns.', qtype=PTR
 

diff --git a/regression-tests/tests/1dyndns-correct-zone/expected_result b/regression-tests/tests/1dyndns-correct-zone/expected_result
index 1dd2dfb7dc81fb06d06c06becab25049268f07cf..f76b19aa41dd72169dfdcf97d7d9e74afe36a2d6 100644 (file)
--- a/regression-tests/tests/1dyndns-correct-zone/expected_result
+++ b/regression-tests/tests/1dyndns-correct-zone/expected_result
@@ -1,5 +1,5 @@
 * Check that the name cannot be found
-1      sub.test.dyndns.        IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      sub.test.dyndns.        3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='occluded.sub.test.dyndns.', qtype=ANY
 * Create the occluded name in the parent zone
@@ -10,7 +10,7 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 * Check that the name cannot be found
-1      sub.test.dyndns.        IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      sub.test.dyndns.        3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='occluded.sub.test.dyndns.', qtype=ANY
 * Create a record in the child zone
@@ -21,7 +21,7 @@ Answer:
 ;sub.test.dyndns.              IN      SOA
 
 * Check that the child zone record is visible
-0      occluded.sub.test.dyndns.       IN      CNAME   3600    child.
+0      occluded.sub.test.dyndns.       3600    IN      CNAME   child.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='occluded.sub.test.dyndns.', qtype=A
 * Remove child record
@@ -32,7 +32,7 @@ Answer:
 ;sub.test.dyndns.              IN      SOA
 
 * Check that the occluded name is invisible again
-1      sub.test.dyndns.        IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      sub.test.dyndns.        3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='occluded.sub.test.dyndns.', qtype=ANY
 * Remove parent record

diff --git a/regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result b/regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result
index d796a2b134e952781c07750453b60e06e68d5a8f..3cb0761168cdfb3196399a5da8395a2c35d4d61a 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dhcpd-host.test.dyndns.', qtype=ANY
 Answer:
@@ -7,8 +7,8 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      dhcpd-host.test.dyndns. IN      A       60      127.0.0.1
-0      dhcpd-host.test.dyndns. IN      TXT     60      "318188eb1a97d43928ccf8494d4a910c8a"
+0      dhcpd-host.test.dyndns. 60      IN      A       127.0.0.1
+0      dhcpd-host.test.dyndns. 60      IN      TXT     "318188eb1a97d43928ccf8494d4a910c8a"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dhcpd-host.test.dyndns.', qtype=ANY
 Answer:
@@ -17,7 +17,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      dhcpd-host.test.dyndns. IN      TXT     60      "318188eb1a97d43928ccf8494d4a910c8a"
+0      dhcpd-host.test.dyndns. 60      IN      TXT     "318188eb1a97d43928ccf8494d4a910c8a"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dhcpd-host.test.dyndns.', qtype=ANY
 Answer:
@@ -26,6 +26,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dhcpd-host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-add-delete-cname/expected_result b/regression-tests/tests/1dyndns-update-add-delete-cname/expected_result
index 2dd91c78723629dab4fec1c82e20c012d3f5151c..c2250b7cb39a37adc83aa2647ab2fee8772aaee7 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-delete-cname/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-cname/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname3.test.dyndns.', qtype=CNAME
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      cname3.test.dyndns.     IN      CNAME   3600    cname1.test.dyndns.
+0      cname3.test.dyndns.     3600    IN      CNAME   cname1.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname3.test.dyndns.', qtype=CNAME
 Answer:
@@ -16,6 +16,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname3.test.dyndns.', qtype=CNAME

diff --git a/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result b/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
index c25d426d076b41753a8f9269afdb74bf0cfa3db4..52eb1ebbd2e52c6f7adec5028379fb40909062c2 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
@@ -1,7 +1,7 @@
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -10,12 +10,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3000    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3000    20 host-2.test.dyndns.
-0      test.dyndns.    IN      MX      3000    30 host-3.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
-2      host-3.test.dyndns.     IN      A       3600    127.0.0.103
+0      test.dyndns.    3000    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3000    IN      MX      20 host-2.test.dyndns.
+0      test.dyndns.    3000    IN      MX      30 host-3.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
+2      host-3.test.dyndns.     3600    IN      A       127.0.0.103
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -24,9 +24,9 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3000    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3000    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3000    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3000    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX

diff --git a/regression-tests/tests/1dyndns-update-add-delete-txt/expected_result b/regression-tests/tests/1dyndns-update-add-delete-txt/expected_result
index 32e29787a0ff2914a4e90c1273c62d2e74918ba9..9c63d64102ca9a1866e342848a4736b2d5e2db13 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-delete-txt/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-txt/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      TXT     3000    "30" "host-3.test.dyndns"
+0      test.dyndns.    3000    IN      TXT     "30" "host-3.test.dyndns"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -16,7 +16,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      TXT     3000    "the quick brown fox"
+0      test.dyndns.    3000    IN      TXT     "the quick brown fox"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -34,7 +34,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -43,7 +43,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      TXT     3000    "the quick brown fox" "jumps over the lazy dog"
+0      test.dyndns.    3000    IN      TXT     "the quick brown fox" "jumps over the lazy dog"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -52,7 +52,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -61,7 +61,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      TXT     3000    "Now, why the chicken might have done it, I just couldn't say" "But if I'm gonna make it home, this is the only way" "Five lanes of traffic, an embankment, then a stream" "It's like it\226\128\153s some kind of amphibianic fever dream" "The total lack of law enforcement on this road's a crime" "I'd write a letter, but I simply haven't got the time"
+0      test.dyndns.    3000    IN      TXT     "Now, why the chicken might have done it, I just couldn't say" "But if I'm gonna make it home, this is the only way" "Five lanes of traffic, an embankment, then a stream" "It's like it\226\128\153s some kind of amphibianic fever dream" "The total lack of law enforcement on this road's a crime" "I'd write a letter, but I simply haven't got the time"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -70,7 +70,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -79,7 +79,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      TXT     3000    "Now, why the chicken might have done it, I just couldn't say" "But if I'm gonna make it home, this is the only way" "Five lanes of traffic, an embankment, then a stream" "It's like it\226\128\153s some kind of amphibianic fever dream" "The total lack of law enforcement on this road's a crime" "I'd write a letter, but I simply haven't got the time"
+0      test.dyndns.    3000    IN      TXT     "Now, why the chicken might have done it, I just couldn't say" "But if I'm gonna make it home, this is the only way" "Five lanes of traffic, an embankment, then a stream" "It's like it\226\128\153s some kind of amphibianic fever dream" "The total lack of law enforcement on this road's a crime" "I'd write a letter, but I simply haven't got the time"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
 Answer:
@@ -88,10 +88,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=TXT
-0      xautosplit.test.dyndns. IN      TXT     3600    "They fixed up the corner store like it was a nightclub - It's permanently disco - Everyone is dressed so oddly I can't recognize them - I can't tell the staff from the customers - Baby check this out, I've got something to say - Man, it's so loud in here " "- When they stop the drum machine and I can think again - I'll remember what it was"
+0      xautosplit.test.dyndns. 3600    IN      TXT     "They fixed up the corner store like it was a nightclub - It's permanently disco - Everyone is dressed so oddly I can't recognize them - I can't tell the staff from the customers - Baby check this out, I've got something to say - Man, it's so loud in here " "- When they stop the drum machine and I can think again - I'll remember what it was"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='xautosplit.test.dyndns.', qtype=TXT
 Answer:
@@ -100,6 +100,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='xautosplit.test.dyndns.', qtype=TXT

diff --git a/regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result b/regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result
index 48a2468c2cb4ec2db73abc643f417b51fa954379..75d1235d07100fb58d74d5a588cc4cbdd165a5ab 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc.add-delete.test.dyndns.', qtype=ANY
 Answer:
@@ -7,10 +7,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      abc.add-delete.test.dyndns.     IN      TXT     3600    "Wildcard with non-empty terminal"
+0      abc.add-delete.test.dyndns.     3600    IN      TXT     "Wildcard with non-empty terminal"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc.add-delete.test.dyndns.', qtype=ANY
-0      abc1.add-delete.test.dyndns.    IN      TXT     3600    "Wildcard with non-empty terminal"
+0      abc1.add-delete.test.dyndns.    3600    IN      TXT     "Wildcard with non-empty terminal"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc1.add-delete.test.dyndns.', qtype=ANY
 Answer:
@@ -19,6 +19,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc.add-delete.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-add-invalid-record/expected_result b/regression-tests/tests/1dyndns-update-add-invalid-record/expected_result
index a8fbee2c1eac1fddd7ae66d7c1a6ed9e120c2f9b..a44dd27ed992c0a308c1ca8c830dd40ca1c0a92d 100644 (file)
--- a/regression-tests/tests/1dyndns-update-add-invalid-record/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-invalid-record/expected_result
@@ -1,7 +1,7 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-invalid.test.dyndns.', qtype=ANY
 RCODE: FORMERR
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-invalid.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result
index 4be40cdf4f69e92669fdfa9275861e499ffe8b82..1625dd9255b0b2f9b2ae71250a1ef7b3fdc259c4 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result
+++ b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result
@@ -1,45 +1,45 @@
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -54,50 +54,50 @@ Check if delegate and glue are added correctly.
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600
 --- End: diff start step.1 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -112,48 +112,48 @@ Check if delegate is deleted and glue auth=1
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600
 --- End: diff start step.2 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -167,47 +167,47 @@ Check if we are back to normal
 no difference
 --- End: diff start step.3 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec
index 9ff75d98228ca379adf0e61453da54705a697333..a056be27cf28647f46a82c5b922c58fa703a88aa 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec
+++ b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec
@@ -1,92 +1,92 @@
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -101,91 +101,91 @@ Check if delegate and glue are added correctly.
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
 --- End: diff start step.1 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    c.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    c.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      c.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      c.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. NS RRSIG NSEC
+1      c.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      c.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. NS RRSIG NSEC
+1      c.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      c.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      c.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. NS RRSIG NSEC
+1      c.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      c.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. NS RRSIG NSEC
+1      c.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -200,91 +200,91 @@ Check if delegate is deleted and glue auth=1
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    'host c ns1'    1
 --- End: diff start step.2 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      ns1.c.host.test.dyndns. IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      ns1.c.host.test.dyndns. IN      RRSIG   3600    NSEC 13 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      ns1.c.host.test.dyndns. 3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      ns1.c.host.test.dyndns. 3600    IN      RRSIG   NSEC 13 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    ns1.c.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      ns1.c.host.test.dyndns. IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      ns1.c.host.test.dyndns. IN      RRSIG   3600    NSEC 13 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      ns1.c.host.test.dyndns. 3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      ns1.c.host.test.dyndns. 3600    IN      RRSIG   NSEC 13 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -298,94 +298,94 @@ Check if we are back to normal
 no difference
 --- End: diff start step.3 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow
index 8d68f6461c21576dfabaff26d143220a5b400633..5a0a642037da0974d5cecf9a483b6b852ddfb8f0 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow
+++ b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow
@@ -1,110 +1,110 @@
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -119,105 +119,105 @@ Check if delegate and glue are added correctly.
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
 --- End: diff start step.1 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ NS
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ NS
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -232,109 +232,109 @@ Check if delegate is deleted and glue auth=1
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    1
 --- End: diff start step.2 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      pjn3mi4alcs21beld7nveruudmhh8t4l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd PJN3MI4ALCS21BELD7NVERUUDMHH8T4N
-1      pjn3mi4alcs21beld7nveruudmhh8t4l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      rnplq1876o9vq8qr599rlr4ism2beht4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd RNPLQ1876O9VQ8QR599RLR4ISM2BEHT6
-1      rnplq1876o9vq8qr599rlr4ism2beht4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      pjn3mi4alcs21beld7nveruudmhh8t4l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd PJN3MI4ALCS21BELD7NVERUUDMHH8T4N
+1      pjn3mi4alcs21beld7nveruudmhh8t4l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      rnplq1876o9vq8qr599rlr4ism2beht4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd RNPLQ1876O9VQ8QR599RLR4ISM2BEHT6
+1      rnplq1876o9vq8qr599rlr4ism2beht4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -348,112 +348,112 @@ Check if we are back to normal
 no difference
 --- End: diff start step.3 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
-1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8V0C5RPU3BNVS3KLJ997NS1CMB4ID023
+1      8v0c5rpu3bnvs3klj997ns1cmb4id021.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
-1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
-1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd BQ8UL1D9PIR8BM0BQ7T9OV5CKK8GHKHF
+1      bq8ul1d9pir8bm0bq7t9ov5ckk8ghkhd.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd UEL5OHQCMEFOO28JDMRCMQ1UGMLO0POE
+1      uel5ohqcmefoo28jdmrcmq1ugmlo0poc.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3
index f660f13025ffe115684cf55959026bf505bb03f9..fd45ed9181eb4ceb9ccfbae720187a730df91db3 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3
+++ b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3
@@ -1,102 +1,102 @@
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -111,97 +111,97 @@ Check if delegate and glue are added correctly.
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
 --- End: diff start step.1 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -216,101 +216,101 @@ Check if delegate is deleted and glue auth=1
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    '6ovod1m5kossaiiqprlaf42prqrkeaq7'      1
 --- End: diff start step.2 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      ncja3un028k84h59aoloj6bh06s80071.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF NS
-1      ncja3un028k84h59aoloj6bh06s80071.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd S30OPRHQREKH5SUH6L530KD668ELK9OS
-1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      ncja3un028k84h59aoloj6bh06s80071.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF NS
+1      ncja3un028k84h59aoloj6bh06s80071.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd S30OPRHQREKH5SUH6L530KD668ELK9OS
+1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -324,104 +324,104 @@ Check if we are back to normal
 no difference
 --- End: diff start step.3 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout
index c71ff6458f02f6640aa82e596710a74230605a6a..bd91850cfaf63ea9c798188f1c1146371b15a509 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout
+++ b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout
@@ -1,102 +1,102 @@
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -111,101 +111,101 @@ Check if delegate and glue are added correctly.
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
 --- End: diff start step.1 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-2      ns1.c.host.test.dyndns. IN      A       3600    192.168.0.1
+1      c.host.test.dyndns.     3600    IN      NS      ns1.c.host.test.dyndns.
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
+2      ns1.c.host.test.dyndns. 3600    IN      A       192.168.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -220,101 +220,101 @@ Check if delegate is deleted and glue auth=1
 > ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    '6ovod1m5kossaiiqprlaf42prqrkeaq7'      1
 --- End: diff start step.2 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
-1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd S30OPRHQREKH5SUH6L530KD668ELK9OS
-1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
+1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd S30OPRHQREKH5SUH6L530KD668ELK9OS
+1      r9s1cj8dkmnmenjn95sti8nhh9utpq9k.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6OVOD1M5KOSSAIIQPRLAF42PRQRKEAQ7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
@@ -328,104 +328,104 @@ Check if we are back to normal
 no difference
 --- End: diff start step.3 ---
 
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delete-add-host/expected_result b/regression-tests/tests/1dyndns-update-delete-add-host/expected_result
index 56a3093e13777cfb67a40da18ab4230e3d0bf0b2..8aec65d66eaeec5dc58c1898af29b41dfa0f120f 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delete-add-host/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-add-host/expected_result
@@ -1,5 +1,5 @@
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
+0      delete-add.test.dyndns. 3600    IN      A       127.0.0.108
+0      delete-add.test.dyndns. 3600    IN      TXT     "Should be gone after a while"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
 Answer:
@@ -8,7 +8,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
+0      delete-add.test.dyndns. 3600    IN      TXT     "Should be gone after a while"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
 Answer:
@@ -17,7 +17,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
+0      delete-add.test.dyndns. 3600    IN      A       127.0.0.108
+0      delete-add.test.dyndns. 3600    IN      TXT     "Should be gone after a while"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result b/regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result
index 49fca9bdf057d09f5f529cf2daa31b9efda135fd..6793e8627780effe9f1d0bce57960555fddac80d 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result
@@ -1,5 +1,5 @@
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
+0      delete-add.test.dyndns. 3600    IN      A       127.0.0.108
+0      delete-add.test.dyndns. 3600    IN      TXT     "Should be gone after a while"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
 Answer:
@@ -8,7 +8,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
 Answer:
@@ -17,7 +17,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
+0      delete-add.test.dyndns. 3600    IN      A       127.0.0.108
+0      delete-add.test.dyndns. 3600    IN      TXT     "Should be gone after a while"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delete-add.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result b/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
index d31c55603b0c6587735a86d44ba40dabdae9ec54..e0af37dcb593fc0ac233e783db9823622460dce1 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
@@ -1,7 +1,7 @@
-0      test.dyndns.    IN      MX      3000    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3000    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3000    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3000    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -10,11 +10,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    100 mx1.google.com.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      100 mx1.google.com.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -23,11 +23,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    100 mx1.google.com.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      100 mx1.google.com.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -36,9 +36,9 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX

diff --git a/regression-tests/tests/1dyndns-update-delete-ns/expected_result b/regression-tests/tests/1dyndns-update-delete-ns/expected_result
index 6dc5c5df119734f53356e30354deaa1f2a538e97..150d71aa69d851077989db36bed26d54069ba68f 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delete-ns/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-ns/expected_result
@@ -1,7 +1,7 @@
-0      test.dyndns.    IN      NS      3600    ns1.test.dyndns.
-0      test.dyndns.    IN      NS      3600    ns2.test.dyndns.
-2      ns1.test.dyndns.        IN      A       3600    127.0.0.1
-2      ns2.test.dyndns.        IN      A       3600    127.0.0.2
+0      test.dyndns.    3600    IN      NS      ns1.test.dyndns.
+0      test.dyndns.    3600    IN      NS      ns2.test.dyndns.
+2      ns1.test.dyndns.        3600    IN      A       127.0.0.1
+2      ns2.test.dyndns.        3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
@@ -10,10 +10,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NS      3600    ns1.test.dyndns.
-0      test.dyndns.    IN      NS      3600    ns2.test.dyndns.
-2      ns1.test.dyndns.        IN      A       3600    127.0.0.1
-2      ns2.test.dyndns.        IN      A       3600    127.0.0.2
+0      test.dyndns.    3600    IN      NS      ns1.test.dyndns.
+0      test.dyndns.    3600    IN      NS      ns2.test.dyndns.
+2      ns1.test.dyndns.        3600    IN      A       127.0.0.1
+2      ns2.test.dyndns.        3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
@@ -22,10 +22,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NS      3600    ns1.test.dyndns.
-0      test.dyndns.    IN      NS      3600    ns2.test.dyndns.
-2      ns1.test.dyndns.        IN      A       3600    127.0.0.1
-2      ns2.test.dyndns.        IN      A       3600    127.0.0.2
+0      test.dyndns.    3600    IN      NS      ns1.test.dyndns.
+0      test.dyndns.    3600    IN      NS      ns2.test.dyndns.
+2      ns1.test.dyndns.        3600    IN      A       127.0.0.1
+2      ns2.test.dyndns.        3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
@@ -34,8 +34,8 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NS      3600    ns2.test.dyndns.
-2      ns2.test.dyndns.        IN      A       3600    127.0.0.2
+0      test.dyndns.    3600    IN      NS      ns2.test.dyndns.
+2      ns2.test.dyndns.        3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
@@ -44,9 +44,9 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NS      3600    ns1.test.dyndns.
-0      test.dyndns.    IN      NS      3600    ns2.test.dyndns.
-2      ns1.test.dyndns.        IN      A       3600    127.0.0.1
-2      ns2.test.dyndns.        IN      A       3600    127.0.0.2
+0      test.dyndns.    3600    IN      NS      ns1.test.dyndns.
+0      test.dyndns.    3600    IN      NS      ns2.test.dyndns.
+2      ns1.test.dyndns.        3600    IN      A       127.0.0.1
+2      ns2.test.dyndns.        3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS

diff --git a/regression-tests/tests/1dyndns-update-delete-soa/expected_result b/regression-tests/tests/1dyndns-update-delete-soa/expected_result
index 7650ccb5f9cc3bb5f22a54936960f5e14bdeb0b3..6ac536d770e155c2e236b2533405f7ef9a2a44f2 100644 (file)
--- a/regression-tests/tests/1dyndns-update-delete-soa/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-soa/expected_result
@@ -1,4 +1,4 @@
-0      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
@@ -7,6 +7,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA

diff --git a/regression-tests/tests/1dyndns-update-in-between/expected_result b/regression-tests/tests/1dyndns-update-in-between/expected_result
index 60994ece8c9d528434e16873cd5b52ea04b61eeb..4b6e44b9dcc800044a6e6e677641de5c95d16c57 100644 (file)
--- a/regression-tests/tests/1dyndns-update-in-between/expected_result
+++ b/regression-tests/tests/1dyndns-update-in-between/expected_result
@@ -1,33 +1,33 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -36,36 +36,36 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
-2      .       IN      OPT     32768   
+0      d.host.test.dyndns.     3600    IN      A       127.0.0.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -74,35 +74,35 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec b/regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec
index 4f17ee70a963267701749b6dfed257ead7a41ad6..8355330d42c04034b974f5737f492da4128df651 100644 (file)
--- a/regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec
+++ b/regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec
@@ -1,65 +1,65 @@
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -68,66 +68,66 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    d.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    d.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    d.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    d.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    d.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
-0      d.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-0      d.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      d.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      d.host.test.dyndns.     3600    IN      A       127.0.0.1
+0      d.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+0      d.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      d.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -136,67 +136,67 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+0      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      e.host.test.dyndns.     IN      NSEC    3600    host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      e.host.test.dyndns.     3600    IN      NSEC    host-1.test.dyndns. A RRSIG NSEC
+1      e.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-in-between/expected_result.narrow b/regression-tests/tests/1dyndns-update-in-between/expected_result.narrow
index d7f6752b312b428be6bc9e73d95f0eaf783b721c..33cd7231f7fcd6bedf245d2866a8d276560b8db1 100644 (file)
--- a/regression-tests/tests/1dyndns-update-in-between/expected_result.narrow
+++ b/regression-tests/tests/1dyndns-update-in-between/expected_result.narrow
@@ -1,73 +1,73 @@
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -76,70 +76,70 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
-0      d.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      d.host.test.dyndns.     3600    IN      A       127.0.0.1
+0      d.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -148,75 +148,75 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
-1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
-1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 9ESKCI2JT1GR4EB97DR5MG4A1NNJN5HL
+1      9eskci2jt1gr4eb97dr5mg4a1nnjn5hj.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd ECLK033HJV6D7GBOLF2UAMVD7A9HJULJ
+1      eclk033hjv6d7gbolf2uamvd7a9hjulh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
-1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MJ
+1      fgun0ru4oe3g76tr551hg97mpu37b6mh.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
-1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
+1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
-1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
-1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 6F4A5UATP57LKHGBUSC1KCFC51T5DI0D
+1      6f4a5uatp57lkhgbusc1kcfc51t5di0b.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LMRSADK2BB62QPRUAULES5I5AP06CP56
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TL50O2E6J8AJ79R56OLQQ5H6R0H7HVLT
+1      tl50o2e6j8aj79r56olqq5h6r0h7hvlr.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3
index 6aa9b93946eb1643010a046a2561cfd4ab85eb35..f5aa214d6e2046713039e9d980afc5f9d3424f90 100644 (file)
--- a/regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3
+++ b/regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3
@@ -1,69 +1,69 @@
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -72,68 +72,68 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
-0      d.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      d.host.test.dyndns.     3600    IN      A       127.0.0.1
+0      d.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
-1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 A RRSIG
+1      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
@@ -142,71 +142,71 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
-0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      a.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      a.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      e.host.test.dyndns.     3600    IN      A       1.1.1.1
+0      e.host.test.dyndns.     3600    IN      RRSIG   A 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
-1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U43 A RRSIG
+1      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY

diff --git a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result
index a6936c26a1fbc433f870bcc4c06093945da3b08a..ee089b487058d088d612c14a2a29803d9a723322 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result
+++ b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result
@@ -1,11 +1,11 @@
-1 test.dyndns. IN NSEC 3600 cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY 1 test.dyndns. IN RRSIG 3600 NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. IN RRSIG 3600 SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1 test.dyndns. 3600 IN NSEC cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY 1 test.dyndns. 3600 IN RRSIG NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. 3600 IN RRSIG SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. 3600 IN SOA ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -14,18 +14,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe N6N81NDT5KU73E19K457TOUB8E6D2LPM A RRSIG
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe N6N81NDT5KU73E19K457TOUB8E6D2LPM A RRSIG
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -34,19 +34,19 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A

diff --git a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3
index 59a80bdea9c3ab66a5d2d861bf28b59600fba91d..5aa0c2548da319fbf6c352fde059008251fb9692 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3
+++ b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3
@@ -1,13 +1,13 @@
-0 test.dyndns. IN NSEC3PARAM 86400 1 0 1 abcd 0 test.dyndns. IN RRSIG 86400 NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+0 test.dyndns. 86400 IN NSEC3PARAM 1 0 1 abcd 0 test.dyndns. 86400 IN RRSIG NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -16,18 +16,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe N6N81NDT5KU73E19K457TOUB8E6D2LPM A RRSIG
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe N6N81NDT5KU73E19K457TOUB8E6D2LPM A RRSIG
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -36,20 +36,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -58,19 +58,19 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A

diff --git a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3-optout
index 7b0f6dac4fe6fec978da9e76b908f55cc30c71e5..b45b302d8e7a9bf0528af11d353894d147d295cf 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3-optout
+++ b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3-optout
@@ -1,13 +1,13 @@
-0 test.dyndns. IN NSEC3PARAM 86400 1 0 1 abcd 0 test.dyndns. IN RRSIG 86400 NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+0 test.dyndns. 86400 IN NSEC3PARAM 1 0 1 abcd 0 test.dyndns. 86400 IN RRSIG NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -16,18 +16,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe PE3H59F3RU6VID4OK0T4TSU6D0NDRVHS A RRSIG
-1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe PE3H59F3RU6VID4OK0T4TSU6D0NDRVHS A RRSIG
+1      lavvds84bcal6n6qnavn3q1u4jcpjev9.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -36,20 +36,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A
 Answer:
@@ -58,19 +58,19 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=A

diff --git a/regression-tests/tests/1dyndns-update-nsec3params/expected_result b/regression-tests/tests/1dyndns-update-nsec3params/expected_result
index 15516a4f6f0eb9ec07fa41392ecb8996762e2fa0..0d56a0d51846c46b79068c01060f51cd64d9eafa 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params/expected_result
+++ b/regression-tests/tests/1dyndns-update-nsec3params/expected_result
@@ -1,11 +1,11 @@
-1 test.dyndns. IN NSEC 3600 cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY 1 test.dyndns. IN RRSIG 3600 NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. IN RRSIG 3600 SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1 test.dyndns. 3600 IN NSEC cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY 1 test.dyndns. 3600 IN RRSIG NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. 3600 IN RRSIG SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ... 1 test.dyndns. 3600 IN SOA ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Answer:
@@ -14,18 +14,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM record exists and A-record added
@@ -90,20 +90,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM is deleted

diff --git a/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3
index 0d94a18e7943ee218739ca5aca44ee93e172f4d9..a98d5e063bfff5b76396c8bc97c455d0974e71ba 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3
+++ b/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3
@@ -1,13 +1,13 @@
-0 test.dyndns. IN NSEC3PARAM 86400 1 0 1 abcd 0 test.dyndns. IN RRSIG 86400 NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+0 test.dyndns. 86400 IN NSEC3PARAM 1 0 1 abcd 0 test.dyndns. 86400 IN RRSIG NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Answer:
@@ -16,18 +16,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM record exists and A-record added
@@ -92,20 +92,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM is deleted
@@ -170,20 +170,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM is added again

diff --git a/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3-optout
index 73b01596449411427c2aa96316f42a2a0e47bcfc..2dd0f2965f1e6ea9de429606f46a4c82f59bd278 100644 (file)
--- a/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3-optout
+++ b/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3-optout
@@ -1,13 +1,13 @@
-0 test.dyndns. IN NSEC3PARAM 86400 1 0 1 abcd 0 test.dyndns. IN RRSIG 86400 NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+0 test.dyndns. 86400 IN NSEC3PARAM 1 0 1 abcd 0 test.dyndns. 86400 IN RRSIG NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . 32768 IN OPT Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Answer:
@@ -16,18 +16,18 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 10 dcbe
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 10 dcbe
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
-1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      NSEC3   3600    1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
-1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe EE295AK1NDT9O0RLL1A4RPPB4NAOV4QM
+1      ac2jl1kik929tr9i5rfcmbucm547n51a.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      NSEC3   1 [flags] 10 dcbe 4KLD1OCH52V50U3NG1HM8R7960VRSVOM A RRSIG
+1      uba3qp1vffon9pq2r07e7ldrnh5mg90v.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM record exists and A-record added
@@ -88,20 +88,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      NSEC    3600    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.dyndns.    3600    IN      NSEC    cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
+1      test.dyndns.    3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      a.host.test.dyndns.     IN      NSEC    3600    e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    3600    a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a.host.test.dyndns.     3600    IN      NSEC    e.host.test.dyndns. A RRSIG NSEC
+1      a.host.test.dyndns.     3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      delete-add.test.dyndns. 3600    IN      NSEC    a.host.test.dyndns. A TXT RRSIG NSEC
+1      delete-add.test.dyndns. 3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM is deleted
@@ -166,20 +166,20 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      test.dyndns.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
+0      test.dyndns.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      test.dyndns.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
-1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   3600    1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
-1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
+1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
+1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      NSEC3   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
+1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
 Check if NSEC3PARAM is added again

diff --git a/regression-tests/tests/1dyndns-update-replace-a-host/expected_result b/regression-tests/tests/1dyndns-update-replace-a-host/expected_result
index 5c7481b4306164bce05546e1d2cc6cdc61121df4..9045ae3162af6d44f150f4a2ef3c9457160fd499 100644 (file)
--- a/regression-tests/tests/1dyndns-update-replace-a-host/expected_result
+++ b/regression-tests/tests/1dyndns-update-replace-a-host/expected_result
@@ -1,4 +1,4 @@
-0      replace.test.dyndns.    IN      A       3600    127.0.0.1
+0      replace.test.dyndns.    3600    IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='replace.test.dyndns.', qtype=A
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      replace.test.dyndns.    IN      A       3600    127.0.0.2
+0      replace.test.dyndns.    3600    IN      A       127.0.0.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='replace.test.dyndns.', qtype=A
 Answer:
@@ -16,6 +16,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      replace.test.dyndns.    IN      A       3600    127.0.0.1
+0      replace.test.dyndns.    3600    IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='replace.test.dyndns.', qtype=A

diff --git a/regression-tests/tests/1dyndns-update-replace-cname/expected_result b/regression-tests/tests/1dyndns-update-replace-cname/expected_result
index 790cceac55148d1bee00999b99d8fcf03b038d4f..3fe39a56b3fd83fbc3d0db241482fce3beb15de5 100644 (file)
--- a/regression-tests/tests/1dyndns-update-replace-cname/expected_result
+++ b/regression-tests/tests/1dyndns-update-replace-cname/expected_result
@@ -1,4 +1,4 @@
-0      cname1.test.dyndns.     IN      CNAME   3600    host-1.test.dyndns.
+0      cname1.test.dyndns.     3600    IN      CNAME   host-1.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname1.test.dyndns.', qtype=CNAME
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      cname1.test.dyndns.     IN      CNAME   3600    host-2.test.dyndns.
+0      cname1.test.dyndns.     3600    IN      CNAME   host-2.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname1.test.dyndns.', qtype=CNAME
 Answer:
@@ -16,6 +16,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      cname1.test.dyndns.     IN      CNAME   3600    host-1.test.dyndns.
+0      cname1.test.dyndns.     3600    IN      CNAME   host-1.test.dyndns.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname1.test.dyndns.', qtype=CNAME

diff --git a/regression-tests/tests/1dyndns-update-replace-mx/expected_result b/regression-tests/tests/1dyndns-update-replace-mx/expected_result
index e14d411ef6d51f8ccd768ae24f07801003fec273..d2c3212b04ecf9cfa7361a9818fb19e177638ff5 100644 (file)
--- a/regression-tests/tests/1dyndns-update-replace-mx/expected_result
+++ b/regression-tests/tests/1dyndns-update-replace-mx/expected_result
@@ -1,7 +1,7 @@
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -10,10 +10,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3000    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3000    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3000    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3000    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
@@ -22,9 +22,9 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      MX      3600    10 host-1.test.dyndns.
-0      test.dyndns.    IN      MX      3600    20 host-2.test.dyndns.
-2      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-2      host-2.test.dyndns.     IN      A       3600    127.0.0.102
+0      test.dyndns.    3600    IN      MX      10 host-1.test.dyndns.
+0      test.dyndns.    3600    IN      MX      20 host-2.test.dyndns.
+2      host-1.test.dyndns.     3600    IN      A       127.0.0.101
+2      host-2.test.dyndns.     3600    IN      A       127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX

diff --git a/regression-tests/tests/1dyndns-update-srv/expected_result b/regression-tests/tests/1dyndns-update-srv/expected_result
index f2032dd7fb718fc4009dcfe313901820adbf695b..3c729d697ded52e4662a9d24c666090225ba03ac 100644 (file)
--- a/regression-tests/tests/1dyndns-update-srv/expected_result
+++ b/regression-tests/tests/1dyndns-update-srv/expected_result
@@ -1,4 +1,4 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      srv.test.dyndns.        IN      SRV     3600    0 100 389 server1.
+0      srv.test.dyndns.        3600    IN      SRV     0 100 389 server1.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
 Answer:
@@ -16,10 +16,10 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      srv.test.dyndns.        IN      SRV     3601    0 100 389 server1.
-0      srv.test.dyndns.        IN      SRV     3601    1 100 389 server2.
+0      srv.test.dyndns.        3601    IN      SRV     0 100 389 server1.
+0      srv.test.dyndns.        3601    IN      SRV     1 100 389 server2.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+1      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV

diff --git a/regression-tests/tests/1dyndns-update-update-ttl/expected_result b/regression-tests/tests/1dyndns-update-update-ttl/expected_result
index 076b75e053f3c6a8a85e4f994eea6526ee7324d8..54857efc259fa5c101aebe6e9f689027fb34bec1 100644 (file)
--- a/regression-tests/tests/1dyndns-update-update-ttl/expected_result
+++ b/regression-tests/tests/1dyndns-update-update-ttl/expected_result
@@ -1,4 +1,4 @@
-0      ttl.test.dyndns.        IN      A       3600    127.0.0.1
+0      ttl.test.dyndns.        3600    IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ttl.test.dyndns.', qtype=A
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      ttl.test.dyndns.        IN      A       31337   127.0.0.1
+0      ttl.test.dyndns.        31337   IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ttl.test.dyndns.', qtype=A
 Answer:
@@ -16,6 +16,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      ttl.test.dyndns.        IN      A       3600    127.0.0.1
+0      ttl.test.dyndns.        3600    IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ttl.test.dyndns.', qtype=A

diff --git a/regression-tests/tests/2dyndns-update-replace-soa/expected_result b/regression-tests/tests/2dyndns-update-replace-soa/expected_result
index 26c13b2975778e795a87bb3b54e3aeb4ba102af5..8bfcde8d777767c0d6b47ba6768966fd94698e06 100644 (file)
--- a/regression-tests/tests/2dyndns-update-replace-soa/expected_result
+++ b/regression-tests/tests/2dyndns-update-replace-soa/expected_result
@@ -1,4 +1,4 @@
-0      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
@@ -7,7 +7,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      SOA     3600    ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
@@ -16,7 +16,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      SOA     3600    ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      SOA     3600    ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
@@ -34,6 +34,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      test.dyndns.    IN      SOA     3600    ns2.test.dyndns. ahu.example.dyndns. 2050101001 28800 7200 604800 86400
+0      test.dyndns.    3600    IN      SOA     ns2.test.dyndns. ahu.example.dyndns. 2050101001 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA

diff --git a/regression-tests/tests/8bit-txt-unescaped/expected_result b/regression-tests/tests/8bit-txt-unescaped/expected_result
index 4a1e67fe769c5a45db32a2c76711210cc2063c42..ee2a9e02168538d9fef23fc3ad314d71d461ebfb 100644 (file)
--- a/regression-tests/tests/8bit-txt-unescaped/expected_result
+++ b/regression-tests/tests/8bit-txt-unescaped/expected_result
@@ -1,3 +1,3 @@
-0      hightxt.test.com.       IN      TXT     3600    "v=spf1 mx ip4:78.46.192.210 \226\128\147all"
+0      hightxt.test.com.       3600    IN      TXT     "v=spf1 mx ip4:78.46.192.210 \226\128\147all"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hightxt.test.com.', qtype=TXT

diff --git a/regression-tests/tests/8bit-txt/expected_result b/regression-tests/tests/8bit-txt/expected_result
index 01b4cebca5eb0ba0cd6d97f40ecb5f0324b70112..5e8197a80b40cfd3acf32fc0076f5e6523cbd843 100644 (file)
--- a/regression-tests/tests/8bit-txt/expected_result
+++ b/regression-tests/tests/8bit-txt/expected_result
@@ -1,3 +1,3 @@
-0      aland.test.com. IN      TXT     3600    "\195\133LAND ISLANDS"
+0      aland.test.com. 3600    IN      TXT     "\195\133LAND ISLANDS"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='aland.test.com.', qtype=TXT

diff --git a/regression-tests/tests/alias-address/expected_result b/regression-tests/tests/alias-address/expected_result
index a9601f9c7d15bed45c3234ffaf0b72dcb2b7181e..8badf963d83853e33fc6c2819432ce955be6c383 100644 (file)
--- a/regression-tests/tests/alias-address/expected_result
+++ b/regression-tests/tests/alias-address/expected_result
@@ -1,16 +1,16 @@
-0      google-alias.example.com.       IN      A       [ttl]   8.8.8.8
+0      google-alias.example.com.       [ttl]   IN      A       8.8.8.8
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=A
-0      google-alias.example.com.       IN      AAAA    [ttl]   2001:4860:4860::8888
+0      google-alias.example.com.       [ttl]   IN      AAAA    2001:4860:4860::8888
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=AAAA
-0      google-alias.example.com.       IN      A       [ttl]   8.8.8.8
+0      google-alias.example.com.       [ttl]   IN      A       8.8.8.8
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=A
-0      google-alias.example.com.       IN      AAAA    [ttl]   2001:4860:4860::8888
+0      google-alias.example.com.       [ttl]   IN      AAAA    2001:4860:4860::8888
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=AAAA
-1      example.com.    IN      SOA     [ttl]   ns1.example.com. ahu.example.com. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     [ttl]   
+1      example.com.    [ttl]   IN      SOA     ns1.example.com. ahu.example.com. [serial] 28800 7200 604800 86400
+2      .       [ttl]   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias1.example.com.', qtype=A

diff --git a/regression-tests/tests/alias-address/expected_result.dnssec b/regression-tests/tests/alias-address/expected_result.dnssec
index b5ab5e53d624b8f575ce90c0ebee2b9bcc2d2df5..0877d59edb69a8bdb89affd0122046fb154c518c 100644 (file)
--- a/regression-tests/tests/alias-address/expected_result.dnssec
+++ b/regression-tests/tests/alias-address/expected_result.dnssec
@@ -1,21 +1,21 @@
-0      google-alias.example.com.       IN      A       [ttl]   8.8.8.8
+0      google-alias.example.com.       [ttl]   IN      A       8.8.8.8
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=A
-0      google-alias.example.com.       IN      AAAA    [ttl]   2001:4860:4860::8888
+0      google-alias.example.com.       [ttl]   IN      AAAA    2001:4860:4860::8888
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=AAAA
-0      google-alias.example.com.       IN      A       [ttl]   8.8.8.8
+0      google-alias.example.com.       [ttl]   IN      A       8.8.8.8
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=A
-0      google-alias.example.com.       IN      AAAA    [ttl]   2001:4860:4860::8888
+0      google-alias.example.com.       [ttl]   IN      AAAA    2001:4860:4860::8888
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=AAAA
-1      example.com.    IN      NSEC    [ttl]   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   [ttl]   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   [ttl]   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     [ttl]   ns1.example.com. ahu.example.com. [serial] 28800 7200 604800 86400
-1      google-alias.example.com.       IN      NSEC    [ttl]   hightype.example.com. A AAAA RRSIG NSEC
-1      google-alias.example.com.       IN      RRSIG   [ttl]   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     [ttl]   
+1      example.com.    [ttl]   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    [ttl]   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    [ttl]   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    [ttl]   IN      SOA     ns1.example.com. ahu.example.com. [serial] 28800 7200 604800 86400
+1      google-alias.example.com.       [ttl]   IN      NSEC    hightype.example.com. A AAAA RRSIG NSEC
+1      google-alias.example.com.       [ttl]   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       [ttl]   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias1.example.com.', qtype=A

diff --git a/regression-tests/tests/alias-mx/expected_result b/regression-tests/tests/alias-mx/expected_result
index e20f2979410944de6141389970d96c5216d85e91..7219d8c56a29d3413820548dc92be1c1136946cd 100644 (file)
--- a/regression-tests/tests/alias-mx/expected_result
+++ b/regression-tests/tests/alias-mx/expected_result
@@ -1,3 +1,3 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='google-alias.example.com.', qtype=MX

diff --git a/regression-tests/tests/any-nxdomain/expected_result b/regression-tests/tests/any-nxdomain/expected_result
index 5040539f70fb8d2961b39db28ea65475944250f1..2027ce860b9e5739c642c0da8c6f00789160b1d5 100644 (file)
--- a/regression-tests/tests/any-nxdomain/expected_result
+++ b/regression-tests/tests/any-nxdomain/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxdomain.example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-nxdomain/expected_result.dnssec b/regression-tests/tests/any-nxdomain/expected_result.dnssec
index 5775bc95ccbe099f48797ce9525f80e354f92a2d..77ae0649be34bc6d5d81d4fe990f9cd85043bc83 100644 (file)
--- a/regression-tests/tests/any-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/any-nxdomain/expected_result.dnssec
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      nxd.example.com.        IN      NSEC    86400   outpost.example.com. CNAME RRSIG NSEC
-1      nxd.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      nxd.example.com.        86400   IN      NSEC    outpost.example.com. CNAME RRSIG NSEC
+1      nxd.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxdomain.example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-nxdomain/expected_result.narrow b/regression-tests/tests/any-nxdomain/expected_result.narrow
index 6d2175946fb13e1969075fca3572ce93df9e47f4..67e82152bf991063c82964be415038e674b9ab7a 100644 (file)
--- a/regression-tests/tests/any-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/any-nxdomain/expected_result.narrow
@@ -1,11 +1,11 @@
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ONNHV82ALU3OM3L4FKFES49N0J2C71BC
-1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ONNHV82ALU3OM3L4FKFES49N0J2C71BC
+1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxdomain.example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-nxdomain/expected_result.nsec3 b/regression-tests/tests/any-nxdomain/expected_result.nsec3
index f737c03997cae64c8c7bc92a4de750d06b32139e..059427a40e6e4ac57324de11e1c6d243bb0dd595 100644 (file)
--- a/regression-tests/tests/any-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/any-nxdomain/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ONNU1VP51T2LDROTDVQ10HVLRQQV2UAA A RRSIG
-1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ONNU1VP51T2LDROTDVQ10HVLRQQV2UAA A RRSIG
+1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxdomain.example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-query/expected_result b/regression-tests/tests/any-query/expected_result
index 2571b0576f11c940267a977a1dec541037ac0fb0..cd6edffd0d4eb6ca778aeaad4e4005635f6bb2cb 100644 (file)
--- a/regression-tests/tests/any-query/expected_result
+++ b/regression-tests/tests/any-query/expected_result
@@ -1,13 +1,13 @@
-0      example.com.    IN      MX      120     10 smtp-servers.example.com.
-0      example.com.    IN      MX      120     15 smtp-servers.test.com.
-0      example.com.    IN      NS      120     ns1.example.com.
-0      example.com.    IN      NS      120     ns2.example.com.
-0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-2      ns1.example.com.        IN      A       120     192.168.1.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.3
-2      smtp-servers.example.com.       IN      A       120     192.168.0.4
+0      example.com.    100000  IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      example.com.    120     IN      MX      10 smtp-servers.example.com.
+0      example.com.    120     IN      MX      15 smtp-servers.test.com.
+0      example.com.    120     IN      NS      ns1.example.com.
+0      example.com.    120     IN      NS      ns2.example.com.
+2      .       32768   IN      OPT     
+2      ns1.example.com.        120     IN      A       192.168.1.1
+2      ns2.example.com.        120     IN      A       192.168.1.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.3
+2      smtp-servers.example.com.       120     IN      A       192.168.0.4
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-query/expected_result.dnssec b/regression-tests/tests/any-query/expected_result.dnssec
index 6032816825aa0524f0f6dfddb71e6ff725bffbbb..51f847caa115f095fac09b719f54638adde186ec 100644 (file)
--- a/regression-tests/tests/any-query/expected_result.dnssec
+++ b/regression-tests/tests/any-query/expected_result.dnssec
@@ -1,23 +1,23 @@
-0      example.com.    IN      DNSKEY  86400   257 3 13 ...
-0      example.com.    IN      MX      120     10 smtp-servers.example.com.
-0      example.com.    IN      MX      120     15 smtp-servers.test.com.
-0      example.com.    IN      NS      120     ns1.example.com.
-0      example.com.    IN      NS      120     ns2.example.com.
-0      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-0      example.com.    IN      RRSIG   100000  SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-2      ns1.example.com.        IN      A       120     192.168.1.1
-2      ns1.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      ns2.example.com.        IN      A       120     192.168.1.2
-2      ns2.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      smtp-servers.example.com.       IN      A       120     192.168.0.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.3
-2      smtp-servers.example.com.       IN      A       120     192.168.0.4
-2      smtp-servers.example.com.       IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      example.com.    120     IN      MX      10 smtp-servers.example.com.
+0      example.com.    120     IN      MX      15 smtp-servers.test.com.
+0      example.com.    120     IN      NS      ns1.example.com.
+0      example.com.    120     IN      NS      ns2.example.com.
+0      example.com.    120     IN      RRSIG   MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    120     IN      RRSIG   NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      DNSKEY  257 3 13 ...
+0      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+0      example.com.    86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
+2      ns1.example.com.        120     IN      A       192.168.1.1
+2      ns1.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      ns2.example.com.        120     IN      A       192.168.1.2
+2      ns2.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      smtp-servers.example.com.       120     IN      A       192.168.0.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.3
+2      smtp-servers.example.com.       120     IN      A       192.168.0.4
+2      smtp-servers.example.com.       120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-query/expected_result.narrow b/regression-tests/tests/any-query/expected_result.narrow
index b36512962c9772cdb6cc0fea1f0ac7a546133642..15588c0f170efc78a1724d227a663cb2f99961a1 100644 (file)
--- a/regression-tests/tests/any-query/expected_result.narrow
+++ b/regression-tests/tests/any-query/expected_result.narrow
@@ -1,23 +1,23 @@
-0      example.com.    IN      DNSKEY  86400   257 3 13 ...
-0      example.com.    IN      MX      120     10 smtp-servers.example.com.
-0      example.com.    IN      MX      120     15 smtp-servers.test.com.
-0      example.com.    IN      NS      120     ns1.example.com.
-0      example.com.    IN      NS      120     ns2.example.com.
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      example.com.    IN      RRSIG   100000  SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-2      ns1.example.com.        IN      A       120     192.168.1.1
-2      ns1.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      ns2.example.com.        IN      A       120     192.168.1.2
-2      ns2.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      smtp-servers.example.com.       IN      A       120     192.168.0.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.3
-2      smtp-servers.example.com.       IN      A       120     192.168.0.4
-2      smtp-servers.example.com.       IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      example.com.    120     IN      MX      10 smtp-servers.example.com.
+0      example.com.    120     IN      MX      15 smtp-servers.test.com.
+0      example.com.    120     IN      NS      ns1.example.com.
+0      example.com.    120     IN      NS      ns2.example.com.
+0      example.com.    120     IN      RRSIG   MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    120     IN      RRSIG   NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      DNSKEY  257 3 13 ...
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      example.com.    86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
+2      ns1.example.com.        120     IN      A       192.168.1.1
+2      ns1.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      ns2.example.com.        120     IN      A       192.168.1.2
+2      ns2.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      smtp-servers.example.com.       120     IN      A       192.168.0.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.3
+2      smtp-servers.example.com.       120     IN      A       192.168.0.4
+2      smtp-servers.example.com.       120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-query/expected_result.nsec3 b/regression-tests/tests/any-query/expected_result.nsec3
index b36512962c9772cdb6cc0fea1f0ac7a546133642..15588c0f170efc78a1724d227a663cb2f99961a1 100644 (file)
--- a/regression-tests/tests/any-query/expected_result.nsec3
+++ b/regression-tests/tests/any-query/expected_result.nsec3
@@ -1,23 +1,23 @@
-0      example.com.    IN      DNSKEY  86400   257 3 13 ...
-0      example.com.    IN      MX      120     10 smtp-servers.example.com.
-0      example.com.    IN      MX      120     15 smtp-servers.test.com.
-0      example.com.    IN      NS      120     ns1.example.com.
-0      example.com.    IN      NS      120     ns2.example.com.
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      example.com.    IN      RRSIG   100000  SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   120     NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-2      ns1.example.com.        IN      A       120     192.168.1.1
-2      ns1.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      ns2.example.com.        IN      A       120     192.168.1.2
-2      ns2.example.com.        IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      smtp-servers.example.com.       IN      A       120     192.168.0.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.3
-2      smtp-servers.example.com.       IN      A       120     192.168.0.4
-2      smtp-servers.example.com.       IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    100000  IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      example.com.    120     IN      MX      10 smtp-servers.example.com.
+0      example.com.    120     IN      MX      15 smtp-servers.test.com.
+0      example.com.    120     IN      NS      ns1.example.com.
+0      example.com.    120     IN      NS      ns2.example.com.
+0      example.com.    120     IN      RRSIG   MX 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    120     IN      RRSIG   NS 13 2 120 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      DNSKEY  257 3 13 ...
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      example.com.    86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+0      example.com.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
+2      ns1.example.com.        120     IN      A       192.168.1.1
+2      ns1.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      ns2.example.com.        120     IN      A       192.168.1.2
+2      ns2.example.com.        120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      smtp-servers.example.com.       120     IN      A       192.168.0.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.3
+2      smtp-servers.example.com.       120     IN      A       192.168.0.4
+2      smtp-servers.example.com.       120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-to-tcp-query/expected_result b/regression-tests/tests/any-to-tcp-query/expected_result
index 238c9957f2cb924f09ad4954e6eaf5432cc10bd7..48fb94c40413872a6f0800a74a8e3df2587cc0be 100644 (file)
--- a/regression-tests/tests/any-to-tcp-query/expected_result
+++ b/regression-tests/tests/any-to-tcp-query/expected_result
@@ -1,3 +1,3 @@
-2      .       IN      OPT     0       
+2      .       0       IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 1, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/tests/any-wildcard-dnssec/expected_result b/regression-tests/tests/any-wildcard-dnssec/expected_result
index 299678deebef58d650b2f7508927818f75d47b23..d9ceb6067902d04dd2d76f4c40f691787e4705f2 100644 (file)
--- a/regression-tests/tests/any-wildcard-dnssec/expected_result
+++ b/regression-tests/tests/any-wildcard-dnssec/expected_result
@@ -1,7 +1,7 @@
-0      www.something.wtest.com.        IN      A       3600    4.3.2.1
-0      www.something.wtest.com.        IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.something.wtest.com.        3600    IN      A       4.3.2.1
+0      www.something.wtest.com.        3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=ANY

diff --git a/regression-tests/tests/any-wildcard-dnssec/expected_result.narrow b/regression-tests/tests/any-wildcard-dnssec/expected_result.narrow
index 4c5eeab062e04678f481537ba28c1245c533c5c4..b79b3da0692c40f804549639b7f0ad499f36c05c 100644 (file)
--- a/regression-tests/tests/any-wildcard-dnssec/expected_result.narrow
+++ b/regression-tests/tests/any-wildcard-dnssec/expected_result.narrow
@@ -1,7 +1,7 @@
-0      www.something.wtest.com.        IN      A       3600    4.3.2.1
-0      www.something.wtest.com.        IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      7q60llva2bt9ucubvn553q9s2pf8ho38.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 7Q60LLVA2BT9UCUBVN553Q9S2PF8HO3A
-1      7q60llva2bt9ucubvn553q9s2pf8ho38.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.something.wtest.com.        3600    IN      A       4.3.2.1
+0      www.something.wtest.com.        3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      7q60llva2bt9ucubvn553q9s2pf8ho38.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 7Q60LLVA2BT9UCUBVN553Q9S2PF8HO3A
+1      7q60llva2bt9ucubvn553q9s2pf8ho38.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=ANY

diff --git a/regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3 b/regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3
index 8bfd25e918fc31d9f7faf8b0427f248e388b862e..ba4eee3effdefb1367f5fd99071363621496589f 100644 (file)
--- a/regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3
+++ b/regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3
@@ -1,7 +1,7 @@
-0      www.something.wtest.com.        IN      A       3600    4.3.2.1
-0      www.something.wtest.com.        IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      7k2dfhl64f0ndftst8u5rr5euminddvb.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 95QOQ246KN3VM7HL8KVG8O45JIHMNLNG A RRSIG
-1      7k2dfhl64f0ndftst8u5rr5euminddvb.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.something.wtest.com.        3600    IN      A       4.3.2.1
+0      www.something.wtest.com.        3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      7k2dfhl64f0ndftst8u5rr5euminddvb.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 95QOQ246KN3VM7HL8KVG8O45JIHMNLNG A RRSIG
+1      7k2dfhl64f0ndftst8u5rr5euminddvb.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=ANY

diff --git a/regression-tests/tests/any-wildcard/expected_result b/regression-tests/tests/any-wildcard/expected_result
index fa040f17e7a01ec9701a183447cfb8b95d5a2fdc..70641ff4ec3c3fa8ad43b29e436be2e565b18cb9 100644 (file)
--- a/regression-tests/tests/any-wildcard/expected_result
+++ b/regression-tests/tests/any-wildcard/expected_result
@@ -1,3 +1,3 @@
-0      www.something.wtest.com.        IN      A       3600    4.3.2.1
+0      www.something.wtest.com.        3600    IN      A       4.3.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=ANY

diff --git a/regression-tests/tests/apex-level-a-but-no-a/expected_result b/regression-tests/tests/apex-level-a-but-no-a/expected_result
index 13394a51df01fc37469947d70d586d4955496fd3..850967d827a6b292e653a01f9edd2f8e56e69558 100644 (file)
--- a/regression-tests/tests/apex-level-a-but-no-a/expected_result
+++ b/regression-tests/tests/apex-level-a-but-no-a/expected_result
@@ -1,3 +1,3 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.com.', qtype=A

diff --git a/regression-tests/tests/apex-level-a/expected_result b/regression-tests/tests/apex-level-a/expected_result
index a0c935a004001de980808dbb8e77211b54766300..8a9124379fc1de8fb118ad7867adda1af70cdb23 100644 (file)
--- a/regression-tests/tests/apex-level-a/expected_result
+++ b/regression-tests/tests/apex-level-a/expected_result
@@ -1,3 +1,3 @@
-0      wtest.com.      IN      A       3600    9.9.9.9
+0      wtest.com.      3600    IN      A       9.9.9.9
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='wtest.com.', qtype=A

diff --git a/regression-tests/tests/apex-level-ns/expected_result b/regression-tests/tests/apex-level-ns/expected_result
index b5e926b696a361d6208d83f386b4a3e068ebcbff..66037f9ac6f015fc191466143088caac9853e121 100644 (file)
--- a/regression-tests/tests/apex-level-ns/expected_result
+++ b/regression-tests/tests/apex-level-ns/expected_result
@@ -1,6 +1,6 @@
-0      test.com.       IN      NS      3600    ns1.test.com.
-0      test.com.       IN      NS      3600    ns2.test.com.
-2      ns1.test.com.   IN      A       3600    1.1.1.1
-2      ns2.test.com.   IN      A       3600    2.2.2.2
+0      test.com.       3600    IN      NS      ns1.test.com.
+0      test.com.       3600    IN      NS      ns2.test.com.
+2      ns1.test.com.   3600    IN      A       1.1.1.1
+2      ns2.test.com.   3600    IN      A       2.2.2.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.com.', qtype=NS

diff --git a/regression-tests/tests/autoptr/expected_result b/regression-tests/tests/autoptr/expected_result
index 755fd0599296761a77c39650e10f5507a87ede3b..2d3c08c52480651029d594eca90acfb8008cff58 100644 (file)
--- a/regression-tests/tests/autoptr/expected_result
+++ b/regression-tests/tests/autoptr/expected_result
@@ -1,3 +1,3 @@
-1      2.0.192.in-addr.arpa.   IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+1      2.0.192.in-addr.arpa.   120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='1.2.0.192.in-addr.arpa.', qtype=PTR

diff --git a/regression-tests/tests/autoptr/expected_result.ldap-strict b/regression-tests/tests/autoptr/expected_result.ldap-strict
index c4bbeba8c12864bb8295c6bb4d66757da754e6e7..e1f7463d770358317ff354d1b11a6cf8e5012a75 100644 (file)
--- a/regression-tests/tests/autoptr/expected_result.ldap-strict
+++ b/regression-tests/tests/autoptr/expected_result.ldap-strict
@@ -1,5 +1,5 @@
-0      1.2.0.192.in-addr.arpa. IN      PTR     120     bar.svcb.example.com.
-0      1.2.0.192.in-addr.arpa. IN      PTR     120     foo.svcb.example.com.
-0      1.2.0.192.in-addr.arpa. IN      PTR     120     host-for-auto-ptr.example.com.
+0      1.2.0.192.in-addr.arpa. 120     IN      PTR     bar.svcb.example.com.
+0      1.2.0.192.in-addr.arpa. 120     IN      PTR     foo.svcb.example.com.
+0      1.2.0.192.in-addr.arpa. 120     IN      PTR     host-for-auto-ptr.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='1.2.0.192.in-addr.arpa.', qtype=PTR

diff --git a/regression-tests/tests/basic-a-resolution/expected_result b/regression-tests/tests/basic-a-resolution/expected_result
index b7318a1274eaaaa25fb05c426eed9934aafeeadb..abe4a12b3f86cd7c75a9fca131ba438cd86ec4e9 100644 (file)
--- a/regression-tests/tests/basic-a-resolution/expected_result
+++ b/regression-tests/tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
-0      outpost.example.com.    IN      A       120     192.168.2.1
+0      outpost.example.com.    120     IN      A       192.168.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/basic-aaaa-resolution/expected_result b/regression-tests/tests/basic-aaaa-resolution/expected_result
index 188088b70c06d0ef684e3557a3ae98474e400ba9..46c35e951db2d14626591f0e5bb6863ea46ff70d 100644 (file)
--- a/regression-tests/tests/basic-aaaa-resolution/expected_result
+++ b/regression-tests/tests/basic-aaaa-resolution/expected_result
@@ -1,3 +1,3 @@
-0      ipv6.example.com.       IN      AAAA    120     2001:6a8:0:1:210:4bff:fe4b:4c61
+0      ipv6.example.com.       120     IN      AAAA    2001:6a8:0:1:210:4bff:fe4b:4c61
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ipv6.example.com.', qtype=AAAA

diff --git a/regression-tests/tests/basic-eui48/expected_result b/regression-tests/tests/basic-eui48/expected_result
index 43eb459812c7346c409e3d5d46b63493917ca5b5..524c9adb59b9d38cbc3576b922708ffc20f5db0d 100644 (file)
--- a/regression-tests/tests/basic-eui48/expected_result
+++ b/regression-tests/tests/basic-eui48/expected_result
@@ -1,3 +1,3 @@
-0      host-0.example.com.     IN      EUI48   120     00-50-56-9b-00-e7
+0      host-0.example.com.     120     IN      EUI48   00-50-56-9b-00-e7
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-0.example.com.', qtype=EUI48

diff --git a/regression-tests/tests/basic-eui64/expected_result b/regression-tests/tests/basic-eui64/expected_result
index 6d3ed0bbf4ffa978799ffaedeac499748d7bf396..8c410ee0c8204f263272d08ffd96e252baac425a 100644 (file)
--- a/regression-tests/tests/basic-eui64/expected_result
+++ b/regression-tests/tests/basic-eui64/expected_result
@@ -1,3 +1,3 @@
-0      host-1.example.com.     IN      EUI64   120     00-50-56-9b-00-e7-7e-57
+0      host-1.example.com.     120     IN      EUI64   00-50-56-9b-00-e7-7e-57
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1.example.com.', qtype=EUI64

diff --git a/regression-tests/tests/basic-hinfo/expected_result b/regression-tests/tests/basic-hinfo/expected_result
index d34fbf760729260249c7deeecd20f3d923fd6a17..152c9bb47c319f1064e02362807a8316fdaf2ef1 100644 (file)
--- a/regression-tests/tests/basic-hinfo/expected_result
+++ b/regression-tests/tests/basic-hinfo/expected_result
@@ -1,3 +1,3 @@
-0      hwinfo.example.com.     IN      HINFO   120     "abc" "def"
+0      hwinfo.example.com.     120     IN      HINFO   "abc" "def"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hwinfo.example.com.', qtype=HINFO

diff --git a/regression-tests/tests/basic-loc/expected_result b/regression-tests/tests/basic-loc/expected_result
index 8cbe941917f665b3e16071223176fb706cd15c12..db2cc0b8adda0f727551008f39d3f5dd90fcae35 100644 (file)
--- a/regression-tests/tests/basic-loc/expected_result
+++ b/regression-tests/tests/basic-loc/expected_result
@@ -1,6 +1,6 @@
-0      location.example.com.   IN      LOC     120     51 56 0.123 N 5 54 0.000 E 4.00m 1.00m 10000.00m 10.00m
-0      location.example.com.   IN      LOC     120     51 56 1.456 S 5 54 0.000 E 4.00m 2.00m 10000.00m 10.00m
-0      location.example.com.   IN      LOC     120     51 56 2.789 N 5 54 0.000 W 4.00m 3.00m 10000.00m 10.00m
-0      location.example.com.   IN      LOC     120     51 56 3.012 S 5 54 0.000 W 4.00m 4.00m 10000.00m 10.00m
+0      location.example.com.   120     IN      LOC     51 56 0.123 N 5 54 0.000 E 4.00m 1.00m 10000.00m 10.00m
+0      location.example.com.   120     IN      LOC     51 56 1.456 S 5 54 0.000 E 4.00m 2.00m 10000.00m 10.00m
+0      location.example.com.   120     IN      LOC     51 56 2.789 N 5 54 0.000 W 4.00m 3.00m 10000.00m 10.00m
+0      location.example.com.   120     IN      LOC     51 56 3.012 S 5 54 0.000 W 4.00m 4.00m 10000.00m 10.00m
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='location.example.com.', qtype=LOC

diff --git a/regression-tests/tests/basic-mb-resolution/expected_result b/regression-tests/tests/basic-mb-resolution/expected_result
index 35f67335938902e0743483ab6169eecf6273c518..06938ac8840f5c97a847ddc7fc835581bb27bfca 100644 (file)
--- a/regression-tests/tests/basic-mb-resolution/expected_result
+++ b/regression-tests/tests/basic-mb-resolution/expected_result
@@ -1,3 +1,3 @@
-0      phil.mb.example.com.    IN      MB      120     pc.mb.example.com.
+0      phil.mb.example.com.    120     IN      MB      pc.mb.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='phil.mb.example.com.', qtype=MB

diff --git a/regression-tests/tests/basic-mg-resolution/expected_result b/regression-tests/tests/basic-mg-resolution/expected_result
index 0fc0b590587e03320437c4322ec8ad988ff8062e..d67bef7df5782a9271b866a7affc0174b211ffba 100644 (file)
--- a/regression-tests/tests/basic-mg-resolution/expected_result
+++ b/regression-tests/tests/basic-mg-resolution/expected_result
@@ -1,4 +1,4 @@
-0      hostmaster.mb.example.com.      IN      MG      120     phil.mb.example.com.
-0      hostmaster.mb.example.com.      IN      MG      120     sheila.mb.example.com.
+0      hostmaster.mb.example.com.      120     IN      MG      phil.mb.example.com.
+0      hostmaster.mb.example.com.      120     IN      MG      sheila.mb.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hostmaster.mb.example.com.', qtype=MG

diff --git a/regression-tests/tests/basic-mr-resolution/expected_result b/regression-tests/tests/basic-mr-resolution/expected_result
index b0b3b9c4774d82e039c66f4c3d3968dcdaca46ab..135dee7e25016f7f72857444b9edeb12a3bb0ab4 100644 (file)
--- a/regression-tests/tests/basic-mr-resolution/expected_result
+++ b/regression-tests/tests/basic-mr-resolution/expected_result
@@ -1,3 +1,3 @@
-0      philip.mb.example.com.  IN      MR      120     phil.mb.example.com.
+0      philip.mb.example.com.  120     IN      MR      phil.mb.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='philip.mb.example.com.', qtype=MR

diff --git a/regression-tests/tests/basic-nonzone/expected_result b/regression-tests/tests/basic-nonzone/expected_result
index 4c6f7d3fb3baa7973204b30d28dfca9d4d437081..88ec2192cae55df254a0750518e306911b7870c8 100644 (file)
--- a/regression-tests/tests/basic-nonzone/expected_result
+++ b/regression-tests/tests/basic-nonzone/expected_result
@@ -1,4 +1,4 @@
-0      nztest.com.     IN      A       3600    127.0.0.1
+0      nztest.com.     3600    IN      A       127.0.0.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nztest.com.', qtype=A
 Rcode: 5 (Query Refused), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0

diff --git a/regression-tests/tests/basic-ns-resolution/expected_result b/regression-tests/tests/basic-ns-resolution/expected_result
index cf0ad3e6549f1e9af7375c0f5131635d900a0aae..9dd91d44bb67cd2ae8e6d830ad16697a70f573ac 100644 (file)
--- a/regression-tests/tests/basic-ns-resolution/expected_result
+++ b/regression-tests/tests/basic-ns-resolution/expected_result
@@ -1,6 +1,6 @@
-0      example.com.    IN      NS      120     ns1.example.com.
-0      example.com.    IN      NS      120     ns2.example.com.
-2      ns1.example.com.        IN      A       120     192.168.1.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
+0      example.com.    120     IN      NS      ns1.example.com.
+0      example.com.    120     IN      NS      ns2.example.com.
+2      ns1.example.com.        120     IN      A       192.168.1.1
+2      ns2.example.com.        120     IN      A       192.168.1.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NS

diff --git a/regression-tests/tests/basic-soa-resolution/expected_result b/regression-tests/tests/basic-soa-resolution/expected_result
index c4062901828bdf7b1e2e50fc0eec456c0f73d8b0..61bdf9463f48e3787b3fd6b0afba2da52ee7da84 100644 (file)
--- a/regression-tests/tests/basic-soa-resolution/expected_result
+++ b/regression-tests/tests/basic-soa-resolution/expected_result
@@ -1,3 +1,3 @@
-0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      example.com.    100000  IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=SOA

diff --git a/regression-tests/tests/basic-srv/expected_result b/regression-tests/tests/basic-srv/expected_result
index c8aa5f580df9836051b83580d81cae4b8f55fd49..812a5b442f44b5a4b73aed7622179114c13e04b9 100644 (file)
--- a/regression-tests/tests/basic-srv/expected_result
+++ b/regression-tests/tests/basic-srv/expected_result
@@ -1,3 +1,3 @@
-0      _ldap._tcp.dc.test.com. IN      SRV     3600    0 100 389 server2.example.net.
+0      _ldap._tcp.dc.test.com. 3600    IN      SRV     0 100 389 server2.example.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='_ldap._tcp.dc.test.com.', qtype=SRV

diff --git a/regression-tests/tests/basic-txt-resolution/expected_result b/regression-tests/tests/basic-txt-resolution/expected_result
index d8f219ab4488ec5e2fd8e9461907345320f3c348..93c579bf12efc18c2cb94bb5de2e8df3b96bdb6d 100644 (file)
--- a/regression-tests/tests/basic-txt-resolution/expected_result
+++ b/regression-tests/tests/basic-txt-resolution/expected_result
@@ -1,3 +1,3 @@
-0      text.example.com.       IN      TXT     120     "Hi, this is some text"
+0      text.example.com.       120     IN      TXT     "Hi, this is some text"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='text.example.com.', qtype=TXT

diff --git a/regression-tests/tests/bind-add-zone/expected_result.bind b/regression-tests/tests/bind-add-zone/expected_result.bind
index 5650c31b2177c630ba95dbf48024fdb3f59aac64..be303587d282175b3b7bfc288cde2983016da365 100644 (file)
--- a/regression-tests/tests/bind-add-zone/expected_result.bind
+++ b/regression-tests/tests/bind-add-zone/expected_result.bind
@@ -1,12 +1,12 @@
 Rcode: 5 (Query Refused), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='ns1.addzone.com.', qtype=A
-0      ns1.test.com.   IN      A       3600    1.1.1.1
+0      ns1.test.com.   3600    IN      A       1.1.1.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.test.com.', qtype=A
 Already loaded
-0      ns1.addzone.com.        IN      A       3600    1.1.1.5
+0      ns1.addzone.com.        3600    IN      A       1.1.1.5
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.addzone.com.', qtype=A
-0      ns1.test.com.   IN      A       3600    1.1.1.1
+0      ns1.test.com.   3600    IN      A       1.1.1.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.test.com.', qtype=A

diff --git a/regression-tests/tests/cname-and-wildcard-at-root/expected_result b/regression-tests/tests/cname-and-wildcard-at-root/expected_result
index cf1dec052b9cf5a167e63c4cd11ea4188547b947..9e96cac89dba280a771f47ecd15a39233b8cd22e 100644 (file)
--- a/regression-tests/tests/cname-and-wildcard-at-root/expected_result
+++ b/regression-tests/tests/cname-and-wildcard-at-root/expected_result
@@ -1,3 +1,3 @@
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure.wtest.com.', qtype=A

diff --git a/regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result b/regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result
index bce73e2b3bae8533977a81e3e0df064e0b6ab5b7..435fe41e6acc431fcfc5af3c358627a7ff9d6106 100644 (file)
--- a/regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result
+++ b/regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result
@@ -1,4 +1,4 @@
-0      yo.test.test.com.       IN      CNAME   3600    server1.test.com.
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+0      yo.test.test.com.       3600    IN      CNAME   server1.test.com.
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='yo.test.test.com.', qtype=AAAA

diff --git a/regression-tests/tests/cname-and-wildcard/expected_result b/regression-tests/tests/cname-and-wildcard/expected_result
index 7eb4eae8649b938d5956491fbe5f2df1cd31b5d2..cbfcac388b2772e7c4c8b8c12b248ba38499597d 100644 (file)
--- a/regression-tests/tests/cname-and-wildcard/expected_result
+++ b/regression-tests/tests/cname-and-wildcard/expected_result
@@ -1,3 +1,3 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.test.test.com.', qtype=MX

diff --git a/regression-tests/tests/cname-but-no-correct-type/expected_result b/regression-tests/tests/cname-but-no-correct-type/expected_result
index 3385cb893b008566e021e734c4ee5fdaa99da6f8..0715599cb78c10e7eef4cb5a02a6ddfcb91cae9c 100644 (file)
--- a/regression-tests/tests/cname-but-no-correct-type/expected_result
+++ b/regression-tests/tests/cname-but-no-correct-type/expected_result
@@ -1,4 +1,4 @@
-0      www.example.com.        IN      CNAME   120     outpost.example.com.
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+0      www.example.com.        120     IN      CNAME   outpost.example.com.
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.example.com.', qtype=AAAA

diff --git a/regression-tests/tests/cname-to-apex/expected_result b/regression-tests/tests/cname-to-apex/expected_result
index 0186b5c091ebb7d1e4448df94cc2bf8203c998cf..48a5582405b6b9379c137d655d8f2e64eb794817 100644 (file)
--- a/regression-tests/tests/cname-to-apex/expected_result
+++ b/regression-tests/tests/cname-to-apex/expected_result
@@ -1,3 +1,3 @@
-0      rhs-at-expansion.example.com.   IN      CNAME   120     example.com.
+0      rhs-at-expansion.example.com.   120     IN      CNAME   example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='rhs-at-expansion.example.com.', qtype=CNAME

diff --git a/regression-tests/tests/cname-to-nxdomain-any/expected_result b/regression-tests/tests/cname-to-nxdomain-any/expected_result
index af822fc263f318697c6de046241907665930e9a1..72543cd0f0a2effd9a7d2fe784a8ce3b2e42ef5d 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain-any/expected_result
+++ b/regression-tests/tests/cname-to-nxdomain-any/expected_result
@@ -1,4 +1,4 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec
index d6bec8166ef43e5d0495267e030cbcbb552b427c..c28605d52d50390404388f736da6f229ecffac1f 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec
+++ b/regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow b/regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow
index d6bec8166ef43e5d0495267e030cbcbb552b427c..c28605d52d50390404388f736da6f229ecffac1f 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow
+++ b/regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow
@@ -1,5 +1,5 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3 b/regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3
index d6bec8166ef43e5d0495267e030cbcbb552b427c..c28605d52d50390404388f736da6f229ecffac1f 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3
+++ b/regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3
@@ -1,5 +1,5 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result b/regression-tests/tests/cname-to-nxdomain/expected_result
index d5c7aca8ea40828c0ed1236cfd687cedaf774cc0..d064cc7e0de8d1d36d2df95090b41e1b6f89c8b0 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain/expected_result
+++ b/regression-tests/tests/cname-to-nxdomain/expected_result
@@ -1,5 +1,5 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
index 44341762a6b3b174b926e5183f0bb04359b4d10a..724ca01ba5b54c3f9708852fc626c6c062cef206 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
@@ -1,11 +1,11 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      nxd.example.com.        IN      NSEC    86400   outpost.example.com. CNAME RRSIG NSEC
-1      nxd.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      nxd.example.com.        86400   IN      NSEC    outpost.example.com. CNAME RRSIG NSEC
+1      nxd.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result.narrow b/regression-tests/tests/cname-to-nxdomain/expected_result.narrow
index a8cf3e54650acb494a57ce6b50b480566849873b..9c7953134cce22e2fc41a77872f6fda9291dd989 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/cname-to-nxdomain/expected_result.narrow
@@ -1,13 +1,13 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ONNHV82ALU3OM3L4FKFES49N0J2C71BC
-1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ONNHV82ALU3OM3L4FKFES49N0J2C71BC
+1      onnhv82alu3om3l4fkfes49n0j2c71ba.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result.nsec3 b/regression-tests/tests/cname-to-nxdomain/expected_result.nsec3
index 51c3b991ff978023739eb29cf9cd7e28327eefb9..339de51c3119491546582aa723322f0c46c93622 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/cname-to-nxdomain/expected_result.nsec3
@@ -1,13 +1,13 @@
-0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
-0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ONNU1VP51T2LDROTDVQ10HVLRQQV2UAA A RRSIG
-1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      nxd.example.com.        120     IN      CNAME   nxdomain.example.com.
+0      nxd.example.com.        120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ONNU1VP51T2LDROTDVQ10HVLRQQV2UAA A RRSIG
+1      onn5kjcskcfqisao7tmqpjkp5kkh111o.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nxd.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-referral/expected_result b/regression-tests/tests/cname-to-referral/expected_result
index 0e9ee6d3f6afa0f77d98ef318d9ecd965d14e57c..284ccf963a7987546349151bdd00b751feda3924 100644 (file)
--- a/regression-tests/tests/cname-to-referral/expected_result
+++ b/regression-tests/tests/cname-to-referral/expected_result
@@ -1,5 +1,5 @@
-0      server1.example.com.    IN      CNAME   120     server1.france.example.com.
-1      france.example.com.     IN      NS      120     ns1.otherprovider.net.
-1      france.example.com.     IN      NS      120     ns2.otherprovider.net.
+0      server1.example.com.    120     IN      CNAME   server1.france.example.com.
+1      france.example.com.     120     IN      NS      ns1.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns2.otherprovider.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='server1.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-unauth-any/expected_result b/regression-tests/tests/cname-to-unauth-any/expected_result
index 1d85883948b94e1e14b731ed50bac12188b82183..f6da15018885a43adfff4f395eb542bc53a5dde0 100644 (file)
--- a/regression-tests/tests/cname-to-unauth-any/expected_result
+++ b/regression-tests/tests/cname-to-unauth-any/expected_result
@@ -1,4 +1,4 @@
-0      unauth.example.com.     IN      CNAME   120     no-idea.example.org.
-2      .       IN      OPT     32768   
+0      unauth.example.com.     120     IN      CNAME   no-idea.example.org.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='unauth.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-unauth-any/expected_result.dnssec b/regression-tests/tests/cname-to-unauth-any/expected_result.dnssec
index 45f3fd7ca5d094c2847c6d4a08166f417ba92c26..b56f898934852a7f00d05b164ed51d050b6891d9 100644 (file)
--- a/regression-tests/tests/cname-to-unauth-any/expected_result.dnssec
+++ b/regression-tests/tests/cname-to-unauth-any/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      unauth.example.com.     IN      CNAME   120     no-idea.example.org.
-0      unauth.example.com.     IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      unauth.example.com.     120     IN      CNAME   no-idea.example.org.
+0      unauth.example.com.     120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='unauth.example.com.', qtype=ANY

diff --git a/regression-tests/tests/cname-to-unauth/expected_result b/regression-tests/tests/cname-to-unauth/expected_result
index 48bbfcaa2e8d92c44e8fca722b84633d4921d23d..d66a4734b6669bb6b1e92bc9c0316c9013763115 100644 (file)
--- a/regression-tests/tests/cname-to-unauth/expected_result
+++ b/regression-tests/tests/cname-to-unauth/expected_result
@@ -1,4 +1,4 @@
-0      unauth.example.com.     IN      CNAME   120     no-idea.example.org.
-2      .       IN      OPT     32768   
+0      unauth.example.com.     120     IN      CNAME   no-idea.example.org.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='unauth.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-to-unauth/expected_result.dnssec b/regression-tests/tests/cname-to-unauth/expected_result.dnssec
index e40da2257bc4312a9dedf8b3a55a2c0693e92602..015b01ee4b7787955ace243a9691d8c386ebaed4 100644 (file)
--- a/regression-tests/tests/cname-to-unauth/expected_result.dnssec
+++ b/regression-tests/tests/cname-to-unauth/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      unauth.example.com.     IN      CNAME   120     no-idea.example.org.
-0      unauth.example.com.     IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      unauth.example.com.     120     IN      CNAME   no-idea.example.org.
+0      unauth.example.com.     120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='unauth.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-wildcard-chain/expected_result b/regression-tests/tests/cname-wildcard-chain/expected_result
index 72e0634e612e89940a0709c3ff77ba831cd4aab3..97ebc5e1c3ddc09f339128f3ac11d70132b82318 100644 (file)
--- a/regression-tests/tests/cname-wildcard-chain/expected_result
+++ b/regression-tests/tests/cname-wildcard-chain/expected_result
@@ -1,9 +1,9 @@
-0      start.example.com.      IN      CNAME   120     x.y.z.w1.example.com.
-0      x.y.z.w1.example.com.   IN      CNAME   120     x.y.z.w2.example.com.
-0      x.y.z.w2.example.com.   IN      CNAME   120     x.y.z.w3.example.com.
-0      x.y.z.w3.example.com.   IN      CNAME   120     x.y.z.w4.example.com.
-0      x.y.z.w4.example.com.   IN      CNAME   120     x.y.z.w5.example.com.
-0      x.y.z.w5.example.com.   IN      A       120     1.2.3.5
-2      .       IN      OPT     32768   
+0      start.example.com.      120     IN      CNAME   x.y.z.w1.example.com.
+0      x.y.z.w1.example.com.   120     IN      CNAME   x.y.z.w2.example.com.
+0      x.y.z.w2.example.com.   120     IN      CNAME   x.y.z.w3.example.com.
+0      x.y.z.w3.example.com.   120     IN      CNAME   x.y.z.w4.example.com.
+0      x.y.z.w4.example.com.   120     IN      CNAME   x.y.z.w5.example.com.
+0      x.y.z.w5.example.com.   120     IN      A       1.2.3.5
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='start.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-wildcard-chain/expected_result.dnssec b/regression-tests/tests/cname-wildcard-chain/expected_result.dnssec
index dc9b4d17197b0214afba107433d00d8840cfe936..fbdf334ebb5377007d6181e4b9e01edfad7ba3b5 100644 (file)
--- a/regression-tests/tests/cname-wildcard-chain/expected_result.dnssec
+++ b/regression-tests/tests/cname-wildcard-chain/expected_result.dnssec
@@ -1,25 +1,25 @@
-0      start.example.com.      IN      CNAME   120     x.y.z.w1.example.com.
-0      start.example.com.      IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w1.example.com.   IN      CNAME   120     x.y.z.w2.example.com.
-0      x.y.z.w1.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w2.example.com.   IN      CNAME   120     x.y.z.w3.example.com.
-0      x.y.z.w2.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w3.example.com.   IN      CNAME   120     x.y.z.w4.example.com.
-0      x.y.z.w3.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w4.example.com.   IN      CNAME   120     x.y.z.w5.example.com.
-0      x.y.z.w4.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w5.example.com.   IN      A       120     1.2.3.5
-0      x.y.z.w5.example.com.   IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      *.w1.example.com.       IN      NSEC    86400   *.w2.example.com. CNAME RRSIG NSEC
-1      *.w1.example.com.       IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      *.w2.example.com.       IN      NSEC    86400   *.w3.example.com. CNAME RRSIG NSEC
-1      *.w2.example.com.       IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      *.w3.example.com.       IN      NSEC    86400   *.w4.example.com. CNAME RRSIG NSEC
-1      *.w3.example.com.       IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      *.w4.example.com.       IN      NSEC    86400   *.w5.example.com. CNAME RRSIG NSEC
-1      *.w4.example.com.       IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      *.w5.example.com.       IN      NSEC    86400   www.example.com. A RRSIG NSEC
-1      *.w5.example.com.       IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      start.example.com.      120     IN      CNAME   x.y.z.w1.example.com.
+0      start.example.com.      120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w1.example.com.   120     IN      CNAME   x.y.z.w2.example.com.
+0      x.y.z.w1.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w2.example.com.   120     IN      CNAME   x.y.z.w3.example.com.
+0      x.y.z.w2.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w3.example.com.   120     IN      CNAME   x.y.z.w4.example.com.
+0      x.y.z.w3.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w4.example.com.   120     IN      CNAME   x.y.z.w5.example.com.
+0      x.y.z.w4.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w5.example.com.   120     IN      A       1.2.3.5
+0      x.y.z.w5.example.com.   120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      *.w1.example.com.       86400   IN      NSEC    *.w2.example.com. CNAME RRSIG NSEC
+1      *.w1.example.com.       86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      *.w2.example.com.       86400   IN      NSEC    *.w3.example.com. CNAME RRSIG NSEC
+1      *.w2.example.com.       86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      *.w3.example.com.       86400   IN      NSEC    *.w4.example.com. CNAME RRSIG NSEC
+1      *.w3.example.com.       86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      *.w4.example.com.       86400   IN      NSEC    *.w5.example.com. CNAME RRSIG NSEC
+1      *.w4.example.com.       86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      *.w5.example.com.       86400   IN      NSEC    www.example.com. A RRSIG NSEC
+1      *.w5.example.com.       86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='start.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-wildcard-chain/expected_result.narrow b/regression-tests/tests/cname-wildcard-chain/expected_result.narrow
index 33ec283deb1c6777b0886a09a32bb1d186addc9c..811846504a56ff11f7206835782bddc51b4793fa 100644 (file)
--- a/regression-tests/tests/cname-wildcard-chain/expected_result.narrow
+++ b/regression-tests/tests/cname-wildcard-chain/expected_result.narrow
@@ -1,25 +1,25 @@
-0      start.example.com.      IN      CNAME   120     x.y.z.w1.example.com.
-0      start.example.com.      IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w1.example.com.   IN      CNAME   120     x.y.z.w2.example.com.
-0      x.y.z.w1.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w2.example.com.   IN      CNAME   120     x.y.z.w3.example.com.
-0      x.y.z.w2.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w3.example.com.   IN      CNAME   120     x.y.z.w4.example.com.
-0      x.y.z.w3.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w4.example.com.   IN      CNAME   120     x.y.z.w5.example.com.
-0      x.y.z.w4.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w5.example.com.   IN      A       120     1.2.3.5
-0      x.y.z.w5.example.com.   IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      6jmrie0v0hnp2flflt36lur7c08n9h45.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 6JMRIE0V0HNP2FLFLT36LUR7C08N9H47
-1      6jmrie0v0hnp2flflt36lur7c08n9h45.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      atcf56s7ucntm82nht67p3g2nqteplou.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ATCF56S7UCNTM82NHT67P3G2NQTEPLP0
-1      atcf56s7ucntm82nht67p3g2nqteplou.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      b6drqdikagd74fa5eme4sdiek1s06343.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd B6DRQDIKAGD74FA5EME4SDIEK1S06345
-1      b6drqdikagd74fa5eme4sdiek1s06343.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      lr0g3vnj9r0nvtlsjnf8eqa68sqj06qg.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd LR0G3VNJ9R0NVTLSJNF8EQA68SQJ06QI
-1      lr0g3vnj9r0nvtlsjnf8eqa68sqj06qg.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vsfa79vv78gd61567bkcai646ta0p276.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VSFA79VV78GD61567BKCAI646TA0P278
-1      vsfa79vv78gd61567bkcai646ta0p276.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      start.example.com.      120     IN      CNAME   x.y.z.w1.example.com.
+0      start.example.com.      120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w1.example.com.   120     IN      CNAME   x.y.z.w2.example.com.
+0      x.y.z.w1.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w2.example.com.   120     IN      CNAME   x.y.z.w3.example.com.
+0      x.y.z.w2.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w3.example.com.   120     IN      CNAME   x.y.z.w4.example.com.
+0      x.y.z.w3.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w4.example.com.   120     IN      CNAME   x.y.z.w5.example.com.
+0      x.y.z.w4.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w5.example.com.   120     IN      A       1.2.3.5
+0      x.y.z.w5.example.com.   120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      6jmrie0v0hnp2flflt36lur7c08n9h45.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 6JMRIE0V0HNP2FLFLT36LUR7C08N9H47
+1      6jmrie0v0hnp2flflt36lur7c08n9h45.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      atcf56s7ucntm82nht67p3g2nqteplou.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ATCF56S7UCNTM82NHT67P3G2NQTEPLP0
+1      atcf56s7ucntm82nht67p3g2nqteplou.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      b6drqdikagd74fa5eme4sdiek1s06343.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd B6DRQDIKAGD74FA5EME4SDIEK1S06345
+1      b6drqdikagd74fa5eme4sdiek1s06343.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      lr0g3vnj9r0nvtlsjnf8eqa68sqj06qg.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd LR0G3VNJ9R0NVTLSJNF8EQA68SQJ06QI
+1      lr0g3vnj9r0nvtlsjnf8eqa68sqj06qg.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vsfa79vv78gd61567bkcai646ta0p276.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VSFA79VV78GD61567BKCAI646TA0P278
+1      vsfa79vv78gd61567bkcai646ta0p276.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='start.example.com.', qtype=A

diff --git a/regression-tests/tests/cname-wildcard-chain/expected_result.nsec3 b/regression-tests/tests/cname-wildcard-chain/expected_result.nsec3
index 714f98fb60a8518e78f6917f93e3e06aed42169a..3bf840747fd314ceaf398a667cfd44624cc6d4e2 100644 (file)
--- a/regression-tests/tests/cname-wildcard-chain/expected_result.nsec3
+++ b/regression-tests/tests/cname-wildcard-chain/expected_result.nsec3
@@ -1,25 +1,25 @@
-0      start.example.com.      IN      CNAME   120     x.y.z.w1.example.com.
-0      start.example.com.      IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w1.example.com.   IN      CNAME   120     x.y.z.w2.example.com.
-0      x.y.z.w1.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w2.example.com.   IN      CNAME   120     x.y.z.w3.example.com.
-0      x.y.z.w2.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w3.example.com.   IN      CNAME   120     x.y.z.w4.example.com.
-0      x.y.z.w3.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w4.example.com.   IN      CNAME   120     x.y.z.w5.example.com.
-0      x.y.z.w4.example.com.   IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      x.y.z.w5.example.com.   IN      A       120     1.2.3.5
-0      x.y.z.w5.example.com.   IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      6jljjg5vg8ab1latv5khfq52jjpdlp9t.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 6JNMPRJN08RFG8QRUMBN91V2UURTV527 A RRSIG
-1      6jljjg5vg8ab1latv5khfq52jjpdlp9t.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      atbcoh7l1gr1cbifhkt3ikmv2o60g8sc.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ATEJUO2QMEO1FORSEB6KH9B0DMVFRK08 A RRSIG
-1      atbcoh7l1gr1cbifhkt3ikmv2o60g8sc.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      b6cdleeregn514pnp2jgmtd67ig3q4qs.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd B6J68ESSIMG1HC5MGJ3B3OQUKL9PKEQB A RRSIG
-1      b6cdleeregn514pnp2jgmtd67ig3q4qs.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      lqu3s8oae1ipc1iobnslma8igo1335a4.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd LR1LEP75CII4P0CLER3MLLQBO1TGKHDO A RRSIG
-1      lqu3s8oae1ipc1iobnslma8igo1335a4.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vscvfu442fdlbq07jpd7bdocd3ig7fo8.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VSGNH606MUV7BFQFN3TRH1D5FKP1IPIV A RRSIG
-1      vscvfu442fdlbq07jpd7bdocd3ig7fo8.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      start.example.com.      120     IN      CNAME   x.y.z.w1.example.com.
+0      start.example.com.      120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w1.example.com.   120     IN      CNAME   x.y.z.w2.example.com.
+0      x.y.z.w1.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w2.example.com.   120     IN      CNAME   x.y.z.w3.example.com.
+0      x.y.z.w2.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w3.example.com.   120     IN      CNAME   x.y.z.w4.example.com.
+0      x.y.z.w3.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w4.example.com.   120     IN      CNAME   x.y.z.w5.example.com.
+0      x.y.z.w4.example.com.   120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      x.y.z.w5.example.com.   120     IN      A       1.2.3.5
+0      x.y.z.w5.example.com.   120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+1      6jljjg5vg8ab1latv5khfq52jjpdlp9t.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 6JNMPRJN08RFG8QRUMBN91V2UURTV527 A RRSIG
+1      6jljjg5vg8ab1latv5khfq52jjpdlp9t.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      atbcoh7l1gr1cbifhkt3ikmv2o60g8sc.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ATEJUO2QMEO1FORSEB6KH9B0DMVFRK08 A RRSIG
+1      atbcoh7l1gr1cbifhkt3ikmv2o60g8sc.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      b6cdleeregn514pnp2jgmtd67ig3q4qs.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd B6J68ESSIMG1HC5MGJ3B3OQUKL9PKEQB A RRSIG
+1      b6cdleeregn514pnp2jgmtd67ig3q4qs.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      lqu3s8oae1ipc1iobnslma8igo1335a4.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd LR1LEP75CII4P0CLER3MLLQBO1TGKHDO A RRSIG
+1      lqu3s8oae1ipc1iobnslma8igo1335a4.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vscvfu442fdlbq07jpd7bdocd3ig7fo8.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VSGNH606MUV7BFQFN3TRH1D5FKP1IPIV A RRSIG
+1      vscvfu442fdlbq07jpd7bdocd3ig7fo8.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='start.example.com.', qtype=A

diff --git a/regression-tests/tests/cross-domain-cname-to-wildcard/expected_result b/regression-tests/tests/cross-domain-cname-to-wildcard/expected_result
index 1ac99a9bd06e93810fcab0ba7537a6f65847cd76..421e9dd80e77539bb7bae68136ccad289d9a88f4 100644 (file)
--- a/regression-tests/tests/cross-domain-cname-to-wildcard/expected_result
+++ b/regression-tests/tests/cross-domain-cname-to-wildcard/expected_result
@@ -1,4 +1,4 @@
-0      bla.something.wtest.com.        IN      A       3600    4.3.2.1
-0      semi-external.example.com.      IN      CNAME   120     bla.something.wtest.com.
+0      bla.something.wtest.com.        3600    IN      A       4.3.2.1
+0      semi-external.example.com.      120     IN      CNAME   bla.something.wtest.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='semi-external.example.com.', qtype=A

diff --git a/regression-tests/tests/cryptokeys/expected_result.dnssec b/regression-tests/tests/cryptokeys/expected_result.dnssec
index a3e101c9f2a03cd4b7250fe904cf1da178fa08b5..dcd62ecfa37868234b565500f1cee90ab8a413f9 100644 (file)
--- a/regression-tests/tests/cryptokeys/expected_result.dnssec
+++ b/regression-tests/tests/cryptokeys/expected_result.dnssec
@@ -1,14 +1,14 @@
-0      cryptokeys.org. IN      DNSKEY  3600    256 3 10 ...
-0      cryptokeys.org. IN      DNSKEY  3600    257 3 13 ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-2      .       IN      OPT     32768   
+0      cryptokeys.org. 3600    IN      DNSKEY  256 3 10 ...
+0      cryptokeys.org. 3600    IN      DNSKEY  257 3 13 ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cryptokeys.org.', qtype=DNSKEY
-1      hiddencryptokeys.org.   IN      NSEC    3600    hiddencryptokeys.org. A NS SOA RRSIG NSEC
-1      hiddencryptokeys.org.   IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-1      hiddencryptokeys.org.   IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-1      hiddencryptokeys.org.   IN      SOA     3600    cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
-2      .       IN      OPT     32768   
+1      hiddencryptokeys.org.   3600    IN      NSEC    hiddencryptokeys.org. A NS SOA RRSIG NSEC
+1      hiddencryptokeys.org.   3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+1      hiddencryptokeys.org.   3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+1      hiddencryptokeys.org.   3600    IN      SOA     cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hiddencryptokeys.org.', qtype=DNSKEY

diff --git a/regression-tests/tests/cryptokeys/expected_result.narrow b/regression-tests/tests/cryptokeys/expected_result.narrow
index 691ab9f9376a9b4f67b9bc2eef577e7e0a9621c4..ea37b4ff695cf0d0955edd584cb8df8472cfc3ac 100644 (file)
--- a/regression-tests/tests/cryptokeys/expected_result.narrow
+++ b/regression-tests/tests/cryptokeys/expected_result.narrow
@@ -1,14 +1,14 @@
-0      cryptokeys.org. IN      DNSKEY  3600    256 3 10 ...
-0      cryptokeys.org. IN      DNSKEY  3600    257 3 13 ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-2      .       IN      OPT     32768   
+0      cryptokeys.org. 3600    IN      DNSKEY  256 3 10 ...
+0      cryptokeys.org. 3600    IN      DNSKEY  257 3 13 ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cryptokeys.org.', qtype=DNSKEY
-1      hiddencryptokeys.org.   IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-1      hiddencryptokeys.org.   IN      SOA     3600    cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
-1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  IN      NSEC3   3600    1 [flags] 1 abcd VD844E5OI5854H79FNAA0F80NQO8BRF1 A NS SOA RRSIG NSEC3PARAM
-1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-2      .       IN      OPT     32768   
+1      hiddencryptokeys.org.   3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+1      hiddencryptokeys.org.   3600    IN      SOA     cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
+1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  3600    IN      NSEC3   1 [flags] 1 abcd VD844E5OI5854H79FNAA0F80NQO8BRF1 A NS SOA RRSIG NSEC3PARAM
+1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hiddencryptokeys.org.', qtype=DNSKEY

diff --git a/regression-tests/tests/cryptokeys/expected_result.nsec3 b/regression-tests/tests/cryptokeys/expected_result.nsec3
index af5aa673570b0426b605b4708622c62343a55456..7ce42390ddc5b34ce36ab0ec2a6a98a8774fb079 100644 (file)
--- a/regression-tests/tests/cryptokeys/expected_result.nsec3
+++ b/regression-tests/tests/cryptokeys/expected_result.nsec3
@@ -1,14 +1,14 @@
-0      cryptokeys.org. IN      DNSKEY  3600    256 3 10 ...
-0      cryptokeys.org. IN      DNSKEY  3600    257 3 13 ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-0      cryptokeys.org. IN      RRSIG   3600    DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
-2      .       IN      OPT     32768   
+0      cryptokeys.org. 3600    IN      DNSKEY  256 3 10 ...
+0      cryptokeys.org. 3600    IN      DNSKEY  257 3 13 ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 13 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+0      cryptokeys.org. 3600    IN      RRSIG   DNSKEY 14 2 3600 [expiry] [inception] [keytag] cryptokeys.org. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cryptokeys.org.', qtype=DNSKEY
-1      hiddencryptokeys.org.   IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-1      hiddencryptokeys.org.   IN      SOA     3600    cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
-1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  IN      NSEC3   3600    1 [flags] 1 abcd VD844E5OI5854H79FNAA0F80NQO8BRF0 A NS SOA RRSIG NSEC3PARAM
-1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
-2      .       IN      OPT     32768   
+1      hiddencryptokeys.org.   3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+1      hiddencryptokeys.org.   3600    IN      SOA     cryptokeys.ds9a.nl. ahu.ds9a.nl. 2009071301 14400 3600 604800 3600
+1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  3600    IN      NSEC3   1 [flags] 1 abcd VD844E5OI5854H79FNAA0F80NQO8BRF0 A NS SOA RRSIG NSEC3PARAM
+1      vd844e5oi5854h79fnaa0f80nqo8brf0.hiddencryptokeys.org.  3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] hiddencryptokeys.org. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hiddencryptokeys.org.', qtype=DNSKEY

diff --git a/regression-tests/tests/direct-dnskey/expected_result b/regression-tests/tests/direct-dnskey/expected_result
index 7890cce0d00d10b6a910b0a9823bdced3619c365..0cfce021d09a847a97225f7110361a4cd03a458b 100644 (file)
--- a/regression-tests/tests/direct-dnskey/expected_result
+++ b/regression-tests/tests/direct-dnskey/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DNSKEY

diff --git a/regression-tests/tests/direct-dnskey/expected_result.dnssec b/regression-tests/tests/direct-dnskey/expected_result.dnssec
index 6fa731dfed137ba14d4ae03e84cbed90f6bdad6d..976cae21847c27aa3fb8433a60c79d467437ef65 100644 (file)
--- a/regression-tests/tests/direct-dnskey/expected_result.dnssec
+++ b/regression-tests/tests/direct-dnskey/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      example.com.    IN      DNSKEY  86400   257 3 13 ...
-0      example.com.    IN      RRSIG   86400   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      example.com.    86400   IN      DNSKEY  257 3 13 ...
+0      example.com.    86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DNSKEY

diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result b/regression-tests/tests/direct-nsec-nxdomain/expected_result
index eb7ac3e81806d0baff60a126263a303050dbb17f..b3f678c2a09a834b9c52dee470c015314085dd94 100644 (file)
--- a/regression-tests/tests/direct-nsec-nxdomain/expected_result
+++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1234x.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
index fa82444fdf4a987b70040a9989279df7633be120..75a042c176694c8ba5f488c13cb07968a34be311 100644 (file)
--- a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      host-12349.example.com. IN      NSEC    86400   host-1235.example.com. A RRSIG NSEC
-1      host-12349.example.com. IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      host-12349.example.com. 86400   IN      NSEC    host-1235.example.com. A RRSIG NSEC
+1      host-12349.example.com. 86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1234x.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result.narrow b/regression-tests/tests/direct-nsec-nxdomain/expected_result.narrow
index 7e49a1163212990f84baa91b9ccfe63b050cd754..af404cd9935f53407a404d28246ae414671db6aa 100644 (file)
--- a/regression-tests/tests/direct-nsec-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result.narrow
@@ -1,11 +1,11 @@
-1      4jiv8rrf3verm9rp51f55587fbfms5g9.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 4JIV8RRF3VERM9RP51F55587FBFMS5GB
-1      4jiv8rrf3verm9rp51f55587fbfms5g9.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      4jiv8rrf3verm9rp51f55587fbfms5g9.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 4JIV8RRF3VERM9RP51F55587FBFMS5GB
+1      4jiv8rrf3verm9rp51f55587fbfms5g9.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1234x.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result.nsec3 b/regression-tests/tests/direct-nsec-nxdomain/expected_result.nsec3
index 5f40ba9cbe8ca93ea0cc87bc290ccd8ff3dac9db..fe7d0d4c819ee2383f78b99222218842fc16630d 100644 (file)
--- a/regression-tests/tests/direct-nsec-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      4j9ti2b4c7iibemvegh99nmoe5m72rb6.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 4JKT13JQPK715SGVL9KSRFVACKO95SV4 A RRSIG
-1      4j9ti2b4c7iibemvegh99nmoe5m72rb6.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      4j9ti2b4c7iibemvegh99nmoe5m72rb6.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 4JKT13JQPK715SGVL9KSRFVACKO95SV4 A RRSIG
+1      4j9ti2b4c7iibemvegh99nmoe5m72rb6.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1234x.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/direct-nsec3param/expected_result b/regression-tests/tests/direct-nsec3param/expected_result
index 8a0c13611efab4817216d9c20021fc3ac55146ed..80dbd932d10dc2a8ecf965a9467d72e542fb79d5 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result
+++ b/regression-tests/tests/direct-nsec3param/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.dnssec b/regression-tests/tests/direct-nsec3param/expected_result.dnssec
index 9a45f8852608c975e2b6129a68ec91ead1ef6904..3fb57524c22cbb59f89fc83b35b9ccd520adba14 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.dnssec
+++ b/regression-tests/tests/direct-nsec3param/expected_result.dnssec
@@ -1,10 +1,10 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.narrow b/regression-tests/tests/direct-nsec3param/expected_result.narrow
index f86656c93ba09b68dca81e3a35f47716fab462af..ea048f6ee5619021164c2f8ae4a47c0b810b4748 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.narrow
+++ b/regression-tests/tests/direct-nsec3param/expected_result.narrow
@@ -1,8 +1,8 @@
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      example.com.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      example.com.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.nsec3 b/regression-tests/tests/direct-nsec3param/expected_result.nsec3
index f86656c93ba09b68dca81e3a35f47716fab462af..ea048f6ee5619021164c2f8ae4a47c0b810b4748 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.nsec3
+++ b/regression-tests/tests/direct-nsec3param/expected_result.nsec3
@@ -1,8 +1,8 @@
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
-0      example.com.    IN      RRSIG   86400   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
+0      example.com.    86400   IN      RRSIG   NSEC3PARAM 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
-0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
+0      example.com.    86400   IN      NSEC3PARAM      1 0 1 abcd
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-rrsig/expected_result b/regression-tests/tests/direct-rrsig/expected_result
index bd42abb7230979535df4d2368ef15bed60965b8f..ec4a1d33b79482246243e16f2701c158e56229c8 100644 (file)
--- a/regression-tests/tests/direct-rrsig/expected_result
+++ b/regression-tests/tests/direct-rrsig/expected_result
@@ -1,3 +1,3 @@
-2      .       IN      OPT     32768   
+2      .       32768   IN      OPT     
 Rcode: 5 (Query Refused), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=RRSIG

diff --git a/regression-tests/tests/direct-wildcard/expected_result b/regression-tests/tests/direct-wildcard/expected_result
index 31fadb79dfc1dfc9801f5807be81e52e049abbaa..b5847968a8fb70232eff8e75b3309614e598a308 100644 (file)
--- a/regression-tests/tests/direct-wildcard/expected_result
+++ b/regression-tests/tests/direct-wildcard/expected_result
@@ -1,3 +1,3 @@
-0      www.something.wtest.com.        IN      A       3600    4.3.2.1
+0      www.something.wtest.com.        3600    IN      A       4.3.2.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/dname-self/expected_result b/regression-tests/tests/dname-self/expected_result
index 6c81e05d2fab28593802423bd706191a5ddb836f..16906d1cda2e77c1c77d33b97270f5ac569b6869 100644 (file)
--- a/regression-tests/tests/dname-self/expected_result
+++ b/regression-tests/tests/dname-self/expected_result
@@ -1,3 +1,3 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.test.com.', qtype=A

diff --git a/regression-tests/tests/dname-too-long-synth/expected_result b/regression-tests/tests/dname-too-long-synth/expected_result
index dd2d6579ff96712c0908d41a4e5a5d6599a8c33a..2e77a14b96bcfaf0b3aeec92c072d3bdb73c6fc3 100644 (file)
--- a/regression-tests/tests/dname-too-long-synth/expected_result
+++ b/regression-tests/tests/dname-too-long-synth/expected_result
@@ -1,4 +1,4 @@
-0      d.test.com.     IN      DNAME   3600    d2.test2.com.
-2      .       IN      OPT     32768   
+0      d.test.com.     3600    IN      DNAME   d2.test2.com.
+2      .       32768   IN      OPT     
 Rcode: 6 (Name Exists when it should not), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.123456.www.d.test.com.', qtype=A

diff --git a/regression-tests/tests/dname-too-long-synth/expected_result.dnssec b/regression-tests/tests/dname-too-long-synth/expected_result.dnssec
index c3054a93f919125bfcdc216a6cbed49ebfaa07b9..6e16ae24a5d262fa30a51e88ed80b8dc3a3142c6 100644 (file)
--- a/regression-tests/tests/dname-too-long-synth/expected_result.dnssec
+++ b/regression-tests/tests/dname-too-long-synth/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      d.test.com.     IN      DNAME   3600    d2.test2.com.
-0      d.test.com.     IN      RRSIG   3600    DNAME 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+0      d.test.com.     3600    IN      DNAME   d2.test2.com.
+0      d.test.com.     3600    IN      RRSIG   DNAME 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 6 (Name Exists when it should not), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.1234567890.123456.www.d.test.com.', qtype=A

diff --git a/regression-tests/tests/dname/expected_result b/regression-tests/tests/dname/expected_result
index 37f1c7e7bd467374945c34cb18c5406f0c8be9d7..af4ea8d7aeef01e178f52b798001f335feee43bf 100644 (file)
--- a/regression-tests/tests/dname/expected_result
+++ b/regression-tests/tests/dname/expected_result
@@ -1,5 +1,5 @@
-0      d.test.com.     IN      DNAME   3600    d2.test2.com.
-0      www.d.test.com. IN      CNAME   3600    www.d2.test2.com.
-2      .       IN      OPT     32768   
+0      d.test.com.     3600    IN      DNAME   d2.test2.com.
+0      www.d.test.com. 3600    IN      CNAME   www.d2.test2.com.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.d.test.com.', qtype=A

diff --git a/regression-tests/tests/dname/expected_result.dnssec b/regression-tests/tests/dname/expected_result.dnssec
index 24dbe8032f9f632a53e74dc5111deb29bc82430d..8c024383c5d22c191c98f243338bb6386eae1d17 100644 (file)
--- a/regression-tests/tests/dname/expected_result.dnssec
+++ b/regression-tests/tests/dname/expected_result.dnssec
@@ -1,6 +1,6 @@
-0      d.test.com.     IN      DNAME   3600    d2.test2.com.
-0      d.test.com.     IN      RRSIG   3600    DNAME 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-0      www.d.test.com. IN      CNAME   3600    www.d2.test2.com.
-2      .       IN      OPT     32768   
+0      d.test.com.     3600    IN      DNAME   d2.test2.com.
+0      d.test.com.     3600    IN      RRSIG   DNAME 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+0      www.d.test.com. 3600    IN      CNAME   www.d2.test2.com.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.d.test.com.', qtype=A

diff --git a/regression-tests/tests/double-srv/expected_result b/regression-tests/tests/double-srv/expected_result
index 4977182dd50b80e4b76c7f6f86195962e8dee025..a768166c189bf229e33e879c26e6a717c5b3ff25 100644 (file)
--- a/regression-tests/tests/double-srv/expected_result
+++ b/regression-tests/tests/double-srv/expected_result
@@ -1,5 +1,5 @@
-0      _double._tcp.dc.test.com.       IN      SRV     3600    0 100 389 server1.test.com.
-0      _double._tcp.dc.test.com.       IN      SRV     3600    1 100 389 server1.test.com.
-2      server1.test.com.       IN      A       3600    1.2.3.4
+0      _double._tcp.dc.test.com.       3600    IN      SRV     0 100 389 server1.test.com.
+0      _double._tcp.dc.test.com.       3600    IN      SRV     1 100 389 server1.test.com.
+2      server1.test.com.       3600    IN      A       1.2.3.4
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='_double._tcp.dc.test.com.', qtype=SRV

diff --git a/regression-tests/tests/double/expected_result b/regression-tests/tests/double/expected_result
index e8c083124e00f0026b481e6d1e5411f30dacef92..d45d04abc6275db746b31d062b727fe9cebcb004 100644 (file)
--- a/regression-tests/tests/double/expected_result
+++ b/regression-tests/tests/double/expected_result
@@ -1,4 +1,4 @@
-0      double.example.com.     IN      A       120     192.168.5.1
-2      .       IN      OPT     32768   
+0      double.example.com.     120     IN      A       192.168.5.1
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='double.example.com.', qtype=A

diff --git a/regression-tests/tests/double/expected_result.dnssec b/regression-tests/tests/double/expected_result.dnssec
index 282bc1511f021436ac8cb648e55a003b0d1eef96..3dcb7258a11178122a1562117ef8470482141a7b 100644 (file)
--- a/regression-tests/tests/double/expected_result.dnssec
+++ b/regression-tests/tests/double/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      double.example.com.     IN      A       120     192.168.5.1
-0      double.example.com.     IN      RRSIG   120     A 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      double.example.com.     120     IN      A       192.168.5.1
+0      double.example.com.     120     IN      RRSIG   A 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='double.example.com.', qtype=A

diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result b/regression-tests/tests/ds-at-apex-noerror/expected_result
index d68238ff8c9d5a2610b735cb08edc78fe1ec64c1..c6eb39cd1a96db9deefaf7ad21e902910f967414 100644 (file)
--- a/regression-tests/tests/ds-at-apex-noerror/expected_result
+++ b/regression-tests/tests/ds-at-apex-noerror/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
index f668ae2542aeabfc1f8e77f30128f3a0bbd9191d..da420cca1c36f6fc7066291264fc19935844f53c 100644 (file)
--- a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
+++ b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result.narrow b/regression-tests/tests/ds-at-apex-noerror/expected_result.narrow
index c51cd216424634ead6da1a87be621c27cb5e0adb..f8ca842bd6d321097031122942194e5533742475 100644 (file)
--- a/regression-tests/tests/ds-at-apex-noerror/expected_result.narrow
+++ b/regression-tests/tests/ds-at-apex-noerror/expected_result.narrow
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3 b/regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3
index 8df160217b727206c8a0c38758798fbfe27c855e..7da5226b59a6ad7004d3c8ce97dbec7e3aad8edb 100644 (file)
--- a/regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3
+++ b/regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-both-sides/expected_result b/regression-tests/tests/ds-at-both-sides/expected_result
index e39f397f9b9a67f84af84631a01deb498901f8ae..5b7cef949099f613e05648b490b2f27b25dc30b6 100644 (file)
--- a/regression-tests/tests/ds-at-both-sides/expected_result
+++ b/regression-tests/tests/ds-at-both-sides/expected_result
@@ -1,5 +1,5 @@
-0      secure-delegated.dnssec-parent.com.     IN      DS      3600    54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   3600    DS 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     3600    IN      DS      54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
+0      secure-delegated.dnssec-parent.com.     3600    IN      RRSIG   DS 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-parent/expected_result b/regression-tests/tests/ds-at-parent/expected_result
index 97172cc7f8e198b48921ed24e9b689ec527f5aa5..e81e2053f773416473f5fe2cfb5193ad267a15ae 100644 (file)
--- a/regression-tests/tests/ds-at-parent/expected_result
+++ b/regression-tests/tests/ds-at-parent/expected_result
@@ -1,3 +1,3 @@
-1      secure-delegated.dnssec-parent.com.     IN      SOA     3600    ns1.secure-delegated.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      secure-delegated.dnssec-parent.com.     3600    IN      SOA     ns1.secure-delegated.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='something.secure-delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-secure-delegation/expected_result b/regression-tests/tests/ds-at-secure-delegation/expected_result
index 0f8143a561c2917d44c3386de93c2e248ff94bef..492c40d15ecb392480c26d847401811ce22bc47b 100644 (file)
--- a/regression-tests/tests/ds-at-secure-delegation/expected_result
+++ b/regression-tests/tests/ds-at-secure-delegation/expected_result
@@ -1,4 +1,4 @@
-0      dsdelegation.example.com.       IN      DS      120     28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
-2      .       IN      OPT     32768   
+0      dsdelegation.example.com.       120     IN      DS      28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dsdelegation.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec b/regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec
index c31ca2f5fa981c5eb56dc437e8d3ab49b5caaad2..33061cf0e1576288df43bea5662095eb038917f9 100644 (file)
--- a/regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec
+++ b/regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      dsdelegation.example.com.       IN      DS      120     28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
-0      dsdelegation.example.com.       IN      RRSIG   120     DS 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      dsdelegation.example.com.       120     IN      DS      28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
+0      dsdelegation.example.com.       120     IN      RRSIG   DS 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dsdelegation.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-delegation/expected_result b/regression-tests/tests/ds-at-unsecure-delegation/expected_result
index a43425bed7a19c2c96184fce80428e14776e146f..d7c60022b4e2848f9bf4bd5063642333cf54eea9 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-delegation/expected_result
+++ b/regression-tests/tests/ds-at-unsecure-delegation/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.dnssec b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.dnssec
index de91e66b7fadb0b0b8b7c3f117993b4f777a3c28..59e4ecec448b294b140addd7b29f70b77c91d4ec 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.dnssec
+++ b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      usa.example.com.        IN      NSEC    86400   *.w1.example.com. NS RRSIG NSEC
-1      usa.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      usa.example.com.        86400   IN      NSEC    *.w1.example.com. NS RRSIG NSEC
+1      usa.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow
index 56cc1fc02ed05f7ef916b3d1c94825f683ad83b0..530fc4f3fd121f7502ffd7138713a68db7986b07 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow
+++ b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      NSEC3   86400   1 1 1 abcd T67RQVQPRIGD7RTB5FAH6C3O7G9TH3J1 NS
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      NSEC3   1 1 1 abcd T67RQVQPRIGD7RTB5FAH6C3O7G9TH3J1 NS
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3 b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3
index 5a0871bd47b3e5a7c0b1a51fa621421a88250511..1000b4ba9cf4f76ec93b22682690c78fe0561de7 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3
+++ b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      NSEC3   86400   1 0 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO NS
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      NSEC3   1 0 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO NS
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout
index 6ba2bb3b608c35d6f86c9c2cd73f369dd5a9c66d..6e44723a8756bb3211640b2b587e294f02c5fe92 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout
+++ b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout
@@ -1,9 +1,9 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   IN      NSEC3   86400   1 1 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO A RRSIG
-1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   86400   IN      NSEC3   1 1 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO A RRSIG
+1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
index 1f8a9c6c79ec2193c2c6de0fa3c5954097e2253a..2cbbabad31f49ebe683a7a642f918715b4acb5b2 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
@@ -1,4 +1,4 @@
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.dnssec b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.dnssec
index 03b9a2e53a0e5035bbbae261cea713a11818bbd2..ac21f93603129fe41d49433fcccd9fd04f8b7095 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.dnssec
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      delegated.dnssec-parent.com.    IN      NSEC    3600    insecure.dnssec-parent.com. NS RRSIG NSEC
-1      delegated.dnssec-parent.com.    IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      delegated.dnssec-parent.com.    3600    IN      NSEC    insecure.dnssec-parent.com. NS RRSIG NSEC
+1      delegated.dnssec-parent.com.    3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow
index fb35b4bce0cfa44f4d9c92120f97dd271d59a497..e5ebc7d4e752f0d0c64198a3fe0a1e1c232dffae 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow
@@ -1,7 +1,7 @@
-1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd BE6IQH4FJRTDHACQK7G3IQ96QCVF2QOK NS
-1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd BE6IQH4FJRTDHACQK7G3IQ96QCVF2QOK NS
+1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3 b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
index 6d3c9917329effb2ab4600beadbc9c41d0a0b823..0be70184f23cb55a09a2dbbf80cf8f4a77856168 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      NSEC3   3600    1 0 1 abcd BT0PJS6CH1JQ6I3QEVR9U5HQBBB8B2M4 NS
-1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     3600    IN      NSEC3   1 0 1 abcd BT0PJS6CH1JQ6I3QEVR9U5HQBBB8B2M4 NS
+1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
index aa2cafbf23bd3b977e6835f8409ddcfa787d8965..96aff471d89f3fd7328265e8e81a896c54f35d85 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
@@ -1,9 +1,9 @@
-1      7on3vems0f8k9999ikei0ig4lfijekdr.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd DVKUO8KJA65GCSQ600E6DI9U719LSJ8U NS DS RRSIG
-1      7on3vems0f8k9999ikei0ig4lfijekdr.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd NIH4L3ODLUG7EN20PENJ8DGNU4OHC98F A NS SOA RRSIG DNSKEY NSEC3PARAM CDS CDNSKEY
-1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+1      7on3vems0f8k9999ikei0ig4lfijekdr.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd DVKUO8KJA65GCSQ600E6DI9U719LSJ8U NS DS RRSIG
+1      7on3vems0f8k9999ikei0ig4lfijekdr.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd NIH4L3ODLUG7EN20PENJ8DGNU4OHC98F A NS SOA RRSIG DNSKEY NSEC3PARAM CDS CDNSKEY
+1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='delegated.dnssec-parent.com.', qtype=DS

diff --git a/regression-tests/tests/ds-inside-delegation/expected_result b/regression-tests/tests/ds-inside-delegation/expected_result
index f45f85ff1d396d09da268e063473e0d2b170266b..aa12757d22c8fd5a7e6a19a217b68e66b861eb64 100644 (file)
--- a/regression-tests/tests/ds-inside-delegation/expected_result
+++ b/regression-tests/tests/ds-inside-delegation/expected_result
@@ -1,7 +1,7 @@
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      .       IN      OPT     32768   
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      .       32768   IN      OPT     
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='sub.usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-inside-delegation/expected_result.dnssec b/regression-tests/tests/ds-inside-delegation/expected_result.dnssec
index 8f3ebb950beec0473b6465fcee34a0facb1b52ef..43cf0ef1f64fa5c80a5874532c886c054d1d6236 100644 (file)
--- a/regression-tests/tests/ds-inside-delegation/expected_result.dnssec
+++ b/regression-tests/tests/ds-inside-delegation/expected_result.dnssec
@@ -1,9 +1,9 @@
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-1      usa.example.com.        IN      NSEC    86400   *.w1.example.com. NS RRSIG NSEC
-1      usa.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+1      usa.example.com.        86400   IN      NSEC    *.w1.example.com. NS RRSIG NSEC
+1      usa.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='sub.usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-inside-delegation/expected_result.narrow b/regression-tests/tests/ds-inside-delegation/expected_result.narrow
index eb5b3691b9ff1f2f224bd169f2c84a3f12ae564c..0050dbcc89de7aeb4f6ce92932ea5c70294ce75f 100644 (file)
--- a/regression-tests/tests/ds-inside-delegation/expected_result.narrow
+++ b/regression-tests/tests/ds-inside-delegation/expected_result.narrow
@@ -1,9 +1,9 @@
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      NSEC3   86400   1 1 1 abcd T67RQVQPRIGD7RTB5FAH6C3O7G9TH3J1 NS
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      .       IN      OPT     32768   
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      NSEC3   1 1 1 abcd T67RQVQPRIGD7RTB5FAH6C3O7G9TH3J1 NS
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      .       32768   IN      OPT     
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='sub.usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-inside-delegation/expected_result.nsec3 b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3
index df3fa6aa97a6710e9fdb7df11f8236e89de8edee..6cfe9e8399c2d243a8bc6302734e21e516ab6d51 100644 (file)
--- a/regression-tests/tests/ds-inside-delegation/expected_result.nsec3
+++ b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3
@@ -1,9 +1,9 @@
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      NSEC3   86400   1 0 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO NS
-1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      .       IN      OPT     32768   
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      NSEC3   1 0 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO NS
+1      t67rqvqprigd7rtb5fah6c3o7g9th3j0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      .       32768   IN      OPT     
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='sub.usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout
index 435dc693357c2774da52ef33ce21a4cc07cc3caa..c31c40ddeda843e422e2e6287d065b7b0946cc09 100644 (file)
--- a/regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout
+++ b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout
@@ -1,11 +1,11 @@
-1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   IN      NSEC3   86400   1 1 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO A RRSIG
-1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   86400   IN      NSEC3   1 1 1 abcd T6A44A7N1B90T5RIS4IBQKT51MMDL0LO A RRSIG
+1      t66sektb7egvs7s57m1qged4h6809g8s.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='sub.usa.example.com.', qtype=DS

diff --git a/regression-tests/tests/ent-any/expected_result b/regression-tests/tests/ent-any/expected_result
index 4bc573a53baaa3803e686eebdf51dcf089df1609..33bd431b0b2883b67f0ee71050ee761fa5c8822c 100644 (file)
--- a/regression-tests/tests/ent-any/expected_result
+++ b/regression-tests/tests/ent-any/expected_result
@@ -1,4 +1,4 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=ANY

diff --git a/regression-tests/tests/ent-any/expected_result.dnssec b/regression-tests/tests/ent-any/expected_result.dnssec
index 48d512cd49044f0359fa2c2e2ba25949f5354e54..79621e831359dd948b7dc4ccf24e652b3af921a3 100644 (file)
--- a/regression-tests/tests/ent-any/expected_result.dnssec
+++ b/regression-tests/tests/ent-any/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NSEC    3600    b.c.test.com. NS RRSIG NSEC
-1      blah.test.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      blah.test.com.  3600    IN      NSEC    b.c.test.com. NS RRSIG NSEC
+1      blah.test.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=ANY

diff --git a/regression-tests/tests/ent-any/expected_result.narrow b/regression-tests/tests/ent-any/expected_result.narrow
index 07c211d3db575c762553919e79c8977e3b59d453..be91f130999696b9fee14c31193764ae9f930dbc 100644 (file)
--- a/regression-tests/tests/ent-any/expected_result.narrow
+++ b/regression-tests/tests/ent-any/expected_result.narrow
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=ANY

diff --git a/regression-tests/tests/ent-any/expected_result.nsec3 b/regression-tests/tests/ent-any/expected_result.nsec3
index 119dfe5e4a7b0194488e40d641d9a40b56fccafd..6a16f770fa06834a64ec8bd5b868c79b29567942 100644 (file)
--- a/regression-tests/tests/ent-any/expected_result.nsec3
+++ b/regression-tests/tests/ent-any/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=ANY

diff --git a/regression-tests/tests/ent-any/expected_result.nsec3-optout b/regression-tests/tests/ent-any/expected_result.nsec3-optout
index fe0122037116d93b79328906bf56b6afc3e43de8..1a3aec7335745a240bad8910f2256d9ee3bbc67c 100644 (file)
--- a/regression-tests/tests/ent-any/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-any/expected_result.nsec3-optout
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=ANY

diff --git a/regression-tests/tests/ent-asterisk/expected_result b/regression-tests/tests/ent-asterisk/expected_result
index 16ac752a65ff285189c3382d47119b9efdf1fec6..c07355b8cd99772a4bb2ce8f47c20a88ccebf622 100644 (file)
--- a/regression-tests/tests/ent-asterisk/expected_result
+++ b/regression-tests/tests/ent-asterisk/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='sub.host.sub.example.com.', qtype=A

diff --git a/regression-tests/tests/ent-asterisk/expected_result.dnssec b/regression-tests/tests/ent-asterisk/expected_result.dnssec
index fcbcc4b84687a9be26e2b96e1c442b29f55499ad..6be3db6d8519f5db55380ed8cbcfb99d7c006363 100644 (file)
--- a/regression-tests/tests/ent-asterisk/expected_result.dnssec
+++ b/regression-tests/tests/ent-asterisk/expected_result.dnssec
@@ -1,9 +1,9 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      host.*.sub.example.com. IN      NSEC    86400   bar.svcb.example.com. A RRSIG NSEC
-1      host.*.sub.example.com. IN      RRSIG   86400   NSEC 13 5 86400 [expiry] [inception] [keytag] example.com. ...
-1      start4.example.com.     IN      NSEC    86400   host.*.sub.example.com. A RRSIG NSEC
-1      start4.example.com.     IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      host.*.sub.example.com. 86400   IN      NSEC    bar.svcb.example.com. A RRSIG NSEC
+1      host.*.sub.example.com. 86400   IN      RRSIG   NSEC 13 5 86400 [expiry] [inception] [keytag] example.com. ...
+1      start4.example.com.     86400   IN      NSEC    host.*.sub.example.com. A RRSIG NSEC
+1      start4.example.com.     86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='sub.host.sub.example.com.', qtype=A

diff --git a/regression-tests/tests/ent-asterisk/expected_result.narrow b/regression-tests/tests/ent-asterisk/expected_result.narrow
index 4f1faaa13f46bc3d317834c3912d137740d362cb..d0f8c68d65a7ad051da4cc8301ea8fea4d501c39 100644 (file)
--- a/regression-tests/tests/ent-asterisk/expected_result.narrow
+++ b/regression-tests/tests/ent-asterisk/expected_result.narrow
@@ -1,11 +1,11 @@
-1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5UI8H56R4776MAICVHPDEGS6CHR19I9A
-1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      hhrsadparthvtuou67trentjstdodla0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd HHRSADPARTHVTUOU67TRENTJSTDODLA1
-1      hhrsadparthvtuou67trentjstdodla0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      pbl3rtqv3mt7eb29gqp0a17o0h42nj76.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd PBL3RTQV3MT7EB29GQP0A17O0H42NJ78
-1      pbl3rtqv3mt7eb29gqp0a17o0h42nj76.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5UI8H56R4776MAICVHPDEGS6CHR19I9A
+1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      hhrsadparthvtuou67trentjstdodla0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd HHRSADPARTHVTUOU67TRENTJSTDODLA1
+1      hhrsadparthvtuou67trentjstdodla0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      pbl3rtqv3mt7eb29gqp0a17o0h42nj76.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd PBL3RTQV3MT7EB29GQP0A17O0H42NJ78
+1      pbl3rtqv3mt7eb29gqp0a17o0h42nj76.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='sub.host.sub.example.com.', qtype=A

diff --git a/regression-tests/tests/ent-asterisk/expected_result.nsec3 b/regression-tests/tests/ent-asterisk/expected_result.nsec3
index 3de50227353fcb8056833ef330876d67166248ce..04967be403fe64c429cb3e46c38affac1e7097b4 100644 (file)
--- a/regression-tests/tests/ent-asterisk/expected_result.nsec3
+++ b/regression-tests/tests/ent-asterisk/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5UMB87SUFNRRMLILGL48A5GUUHG7RI58
-1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      hhrsadparthvtuou67trentjstdodla0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd HHTKKD5HB125SGANBTKMQK84LULH60LH
-1      hhrsadparthvtuou67trentjstdodla0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      pbkjnd53pnsru5jmaqnk3k936pv2pq5j.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd PBL4SE96F8T4H4Q24UQMRQ4KS96AHPV3 A RRSIG
-1      pbkjnd53pnsru5jmaqnk3k936pv2pq5j.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5UMB87SUFNRRMLILGL48A5GUUHG7RI58
+1      5ui8h56r4776maicvhpdegs6chr19i99.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      hhrsadparthvtuou67trentjstdodla0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd HHTKKD5HB125SGANBTKMQK84LULH60LH
+1      hhrsadparthvtuou67trentjstdodla0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      pbkjnd53pnsru5jmaqnk3k936pv2pq5j.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd PBL4SE96F8T4H4Q24UQMRQ4KS96AHPV3 A RRSIG
+1      pbkjnd53pnsru5jmaqnk3k936pv2pq5j.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='sub.host.sub.example.com.', qtype=A

diff --git a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec
index 603e87d85da746219d396b1da29e20b69e455d31..52487ef6136d9665f83bdd081ce656ca4b4e97fb 100644 (file)
--- a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec
+++ b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      b.c.test.com.   IN      NSEC    3600    *.a.b.c.test.com. A RRSIG NSEC
-1      b.c.test.com.   IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      b.c.test.com.   3600    IN      NSEC    *.a.b.c.test.com. A RRSIG NSEC
+1      b.c.test.com.   3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.c.test.com.', qtype=TXT

diff --git a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow
index 314cc70ca2c955391363acd74aa6f7f7850f9ea2..f9443757965011a523b9613c748f40ff27908d48 100644 (file)
--- a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow
+++ b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow
@@ -1,7 +1,7 @@
-1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AS A RRSIG
-1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AS A RRSIG
+1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.c.test.com.', qtype=TXT

diff --git a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3 b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3
index f31d9f153bbe3aa407a0dfc8956486a4ad879865..88e1f3afbd61d18532c168fce357c3ece9f4f558 100644 (file)
--- a/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3
+++ b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG
-1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG
+1      a5labagjjevr86gh0hf3jg7nufhga5ar.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.c.test.com.', qtype=TXT

diff --git a/regression-tests/tests/ent-soa/expected_result b/regression-tests/tests/ent-soa/expected_result
index bd9a668a993ba5f83dcf457cd56e0c6b4ce2aef5..89a760f74b67e4af0fc23c1308da9bf26b52f9b6 100644 (file)
--- a/regression-tests/tests/ent-soa/expected_result
+++ b/regression-tests/tests/ent-soa/expected_result
@@ -1,4 +1,4 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=SOA

diff --git a/regression-tests/tests/ent-soa/expected_result.dnssec b/regression-tests/tests/ent-soa/expected_result.dnssec
index d8346bcd0bcdbea96ee72bb07520bdbcef35844e..e79cd55ff5945fd00afec9a61471a10acec017ed 100644 (file)
--- a/regression-tests/tests/ent-soa/expected_result.dnssec
+++ b/regression-tests/tests/ent-soa/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NSEC    3600    b.c.test.com. NS RRSIG NSEC
-1      blah.test.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      blah.test.com.  3600    IN      NSEC    b.c.test.com. NS RRSIG NSEC
+1      blah.test.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=SOA

diff --git a/regression-tests/tests/ent-soa/expected_result.narrow b/regression-tests/tests/ent-soa/expected_result.narrow
index dc6c27b7538edd84895702bde9b5937f667dcb28..4e7f9645d52113a6bb89a16d49ac66130e59bcfa 100644 (file)
--- a/regression-tests/tests/ent-soa/expected_result.narrow
+++ b/regression-tests/tests/ent-soa/expected_result.narrow
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=SOA

diff --git a/regression-tests/tests/ent-soa/expected_result.nsec3 b/regression-tests/tests/ent-soa/expected_result.nsec3
index 1d99f83a2aaa422fe1aa38b444410996813b5c82..893c9262c808595434c6b3fee0c91864493a5323 100644 (file)
--- a/regression-tests/tests/ent-soa/expected_result.nsec3
+++ b/regression-tests/tests/ent-soa/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=SOA

diff --git a/regression-tests/tests/ent-soa/expected_result.nsec3-optout b/regression-tests/tests/ent-soa/expected_result.nsec3-optout
index 4a70c16df9cafa5aa9f11ee3df7d103f47fff9fb..dfa3fb3af9732369402c210872847fc0fb32fb2c 100644 (file)
--- a/regression-tests/tests/ent-soa/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-soa/expected_result.nsec3-optout
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=SOA

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result b/regression-tests/tests/ent-unsigned-delegation/expected_result
index 81e37590bc6e310f37af402cc49de558ee40d7e3..41fecb90babe4069f8b5676fbfa26c138a8fdaf8 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result
@@ -1,4 +1,4 @@
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
index f7edf1b5e5cd4ae8806866b82dabeab6f7856b74..6a7cb568584a981e133865c83eaa1cb5a3a5a01a 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      dnssec-parent.com.      IN      NSEC    3600    insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY CDS CDNSKEY
-1      dnssec-parent.com.      IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      dnssec-parent.com.      3600    IN      NSEC    insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY CDS CDNSKEY
+1      dnssec-parent.com.      3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
index bb5e390030cf6c5728af6fea24d836b773f9a1e9..f171ee260703b186eb9480f30af70002c17edbea 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
@@ -1,7 +1,7 @@
-1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd 7R6PBISCIPOT7MD4QJKEA2LGRD2SRR1A
-1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd 7R6PBISCIPOT7MD4QJKEA2LGRD2SRR1A
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3 b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
index 816d7ebff18399edd018371ea9cdbddb30fd8e32..d064071caa4884d12782bcc15369bbe11be5648a 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      NSEC3   3600    1 0 1 abcd BE6IQH4FJRTDHACQK7G3IQ96QCVF2QOJ
-1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     3600    IN      NSEC3   1 0 1 abcd BE6IQH4FJRTDHACQK7G3IQ96QCVF2QOJ
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
index 8880e3211b1081698f1eda78e16d4d6ecc55897c..cba2aa1ea6ea9d82684f43010618f04013693e58 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
@@ -1,9 +1,9 @@
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd QOQSRIQRVI1G1QL3TPPH2248Q9LDPEPF
-1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     IN      NSEC3   3600    1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A RRSIG
-1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd QOQSRIQRVI1G1QL3TPPH2248Q9LDPEPF
+1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     3600    IN      NSEC3   1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A RRSIG
+1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-wildcard-below-ent/expected_result b/regression-tests/tests/ent-wildcard-below-ent/expected_result
index 7b3d4629310966940912381a0d962c47c9cdc2ad..aae69d278d099d6720a3ac8b5af92c0e77ccf6f7 100644 (file)
--- a/regression-tests/tests/ent-wildcard-below-ent/expected_result
+++ b/regression-tests/tests/ent-wildcard-below-ent/expected_result
@@ -1,4 +1,4 @@
-0      something.a.b.c.test.com.       IN      A       3600    8.7.6.5
-2      .       IN      OPT     32768   
+0      something.a.b.c.test.com.       3600    IN      A       8.7.6.5
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='something.a.b.c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec b/regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec
index 4a6ac0ef25cbc02c50b735f3609e60dbdc137c65..a9dd716784c2d77f636a5c6e241d3c476df5e818 100644 (file)
--- a/regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec
+++ b/regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec
@@ -1,7 +1,7 @@
-0      something.a.b.c.test.com.       IN      A       3600    8.7.6.5
-0      something.a.b.c.test.com.       IN      RRSIG   3600    A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
-1      *.a.b.c.test.com.       IN      NSEC    3600    counter.test.com. A RRSIG NSEC
-1      *.a.b.c.test.com.       IN      RRSIG   3600    NSEC 13 5 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+0      something.a.b.c.test.com.       3600    IN      A       8.7.6.5
+0      something.a.b.c.test.com.       3600    IN      RRSIG   A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
+1      *.a.b.c.test.com.       3600    IN      NSEC    counter.test.com. A RRSIG NSEC
+1      *.a.b.c.test.com.       3600    IN      RRSIG   NSEC 13 5 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='something.a.b.c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow b/regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow
index 18724720e8846b10ed794a97481c0a53a746e5bd..36734a97a1e27639f82f8c00308e87ad0c5199d7 100644 (file)
--- a/regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow
+++ b/regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow
@@ -1,7 +1,7 @@
-0      something.a.b.c.test.com.       IN      A       3600    8.7.6.5
-0      something.a.b.c.test.com.       IN      RRSIG   3600    A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
-1      qjeirdhb04ir4vbs5pbbhbue69dlq9nr.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd QJEIRDHB04IR4VBS5PBBHBUE69DLQ9NT
-1      qjeirdhb04ir4vbs5pbbhbue69dlq9nr.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+0      something.a.b.c.test.com.       3600    IN      A       8.7.6.5
+0      something.a.b.c.test.com.       3600    IN      RRSIG   A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
+1      qjeirdhb04ir4vbs5pbbhbue69dlq9nr.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd QJEIRDHB04IR4VBS5PBBHBUE69DLQ9NT
+1      qjeirdhb04ir4vbs5pbbhbue69dlq9nr.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='something.a.b.c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3 b/regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3
index e4556b3835db3b98a6a7d1dd71758e886411ffd6..f55b269427a872de2b1dc941533bdc5f3b141385 100644 (file)
--- a/regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3
+++ b/regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3
@@ -1,7 +1,7 @@
-0      something.a.b.c.test.com.       IN      A       3600    8.7.6.5
-0      something.a.b.c.test.com.       IN      RRSIG   3600    A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
-1      qd81ag9inqts1ocs7api0pji94k27btr.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG
-1      qd81ag9inqts1ocs7api0pji94k27btr.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+0      something.a.b.c.test.com.       3600    IN      A       8.7.6.5
+0      something.a.b.c.test.com.       3600    IN      RRSIG   A 13 5 3600 [expiry] [inception] [keytag] test.com. ...
+1      qd81ag9inqts1ocs7api0pji94k27btr.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG
+1      qd81ag9inqts1ocs7api0pji94k27btr.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='something.a.b.c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent/expected_result b/regression-tests/tests/ent/expected_result
index b0d28ac6353bd9b24b67cc256291c2fa62a2a59d..ee339350ab9c9336063f6ccd094308dd9de2fa7b 100644 (file)
--- a/regression-tests/tests/ent/expected_result
+++ b/regression-tests/tests/ent/expected_result
@@ -1,4 +1,4 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent/expected_result.dnssec b/regression-tests/tests/ent/expected_result.dnssec
index b44bcb568f9feb6c304fd6bf4bff2a502bbd9bcc..7dd84cf29122fa633db835879cbb7f2c8939d52a 100644 (file)
--- a/regression-tests/tests/ent/expected_result.dnssec
+++ b/regression-tests/tests/ent/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NSEC    3600    b.c.test.com. NS RRSIG NSEC
-1      blah.test.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      blah.test.com.  3600    IN      NSEC    b.c.test.com. NS RRSIG NSEC
+1      blah.test.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent/expected_result.narrow b/regression-tests/tests/ent/expected_result.narrow
index 959c581a44706d6bb87839b78fdfc6b3272cdc60..673e2b3340ec74ba68ec592601ff0eadd3d8570b 100644 (file)
--- a/regression-tests/tests/ent/expected_result.narrow
+++ b/regression-tests/tests/ent/expected_result.narrow
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G5
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent/expected_result.nsec3 b/regression-tests/tests/ent/expected_result.nsec3
index b7c8ce0030d024e896273da3e8af3f353cb049c1..6b06fdb73fc3d4fbe82b6880a88600490700038f 100644 (file)
--- a/regression-tests/tests/ent/expected_result.nsec3
+++ b/regression-tests/tests/ent/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=A

diff --git a/regression-tests/tests/ent/expected_result.nsec3-optout b/regression-tests/tests/ent/expected_result.nsec3-optout
index f4058c4f2fd0962c7b272aea1ce0fbc2b9677ba5..6f2e78dc0109cb4e8d548330499d57ab5629dd12 100644 (file)
--- a/regression-tests/tests/ent/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent/expected_result.nsec3-optout
@@ -1,7 +1,7 @@
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.test.com.', qtype=A

diff --git a/regression-tests/tests/escaped-txt/expected_result b/regression-tests/tests/escaped-txt/expected_result
index 5cc5be1b2b6c5705cdead2bed41e35714ae93a6c..dc7354fa888c719eaea31aff148d1be49e0c3e04 100644 (file)
--- a/regression-tests/tests/escaped-txt/expected_result
+++ b/regression-tests/tests/escaped-txt/expected_result
@@ -1,12 +1,12 @@
-0      text0.example.com.      IN      TXT     120     "k=rsa; p=one"
+0      text0.example.com.      120     IN      TXT     "k=rsa; p=one"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='text0.example.com.', qtype=TXT
-0      text1.example.com.      IN      TXT     120     "k=rsa; p=one"
+0      text1.example.com.      120     IN      TXT     "k=rsa; p=one"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='text1.example.com.', qtype=TXT
-0      text2.example.com.      IN      TXT     120     "k=rsa\\; p=one"
+0      text2.example.com.      120     IN      TXT     "k=rsa\\; p=one"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='text2.example.com.', qtype=TXT
-0      text3.example.com.      IN      TXT     120     "k=rsa\\; p=one"
+0      text3.example.com.      120     IN      TXT     "k=rsa\\; p=one"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='text3.example.com.', qtype=TXT

diff --git a/regression-tests/tests/external-cname-pointer/expected_result b/regression-tests/tests/external-cname-pointer/expected_result
index a83476a2d674cd241781eeccc7ca716fd8b15e7b..24290fcda767b14dfbf20030132f3092e252d795 100644 (file)
--- a/regression-tests/tests/external-cname-pointer/expected_result
+++ b/regression-tests/tests/external-cname-pointer/expected_result
@@ -1,3 +1,3 @@
-0      external.example.com.   IN      CNAME   120     somewhere.else.net.
+0      external.example.com.   120     IN      CNAME   somewhere.else.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='external.example.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result
index faf854789cb6ebb7f4a701df805a18f5d4f6a78a..395a22e7dbfdd1b7c98b96a8e933521a2630a12d 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result
+++ b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.something.wtest.com.      IN      A       3600    4.3.2.1
-0      www.a.b.c.d.e.something.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      A       4.3.2.1
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow
index 53655e7016e346c868faccfd1e2aa7627a7465a8..81bc06e04b25c3528209aeb1748c8a6c2ca84067 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow
+++ b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.something.wtest.com.      IN      A       3600    4.3.2.1
-0      www.a.b.c.d.e.something.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pqgjjrj5si55uc1208gt1hp1k217fhqu.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd PQGJJRJ5SI55UC1208GT1HP1K217FHR0
-1      pqgjjrj5si55uc1208gt1hp1k217fhqu.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      A       4.3.2.1
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pqgjjrj5si55uc1208gt1hp1k217fhqu.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd PQGJJRJ5SI55UC1208GT1HP1K217FHR0
+1      pqgjjrj5si55uc1208gt1hp1k217fhqu.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3 b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3
index d22bb8df7b42d3a3f06124d7f279c66061fed120..f0ea4556251428049a7813a0bdd52208d74ee76f 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3
+++ b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.something.wtest.com.      IN      A       3600    4.3.2.1
-0      www.a.b.c.d.e.something.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      A       4.3.2.1
+0      www.a.b.c.d.e.something.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard/expected_result b/regression-tests/tests/five-levels-wildcard/expected_result
index 3d0495b7de95aa9bd9a6ec75bebb8258f46c90d7..d577e54aa2a9e52be9435cab3a56c2a1a57a84b4 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard/expected_result
+++ b/regression-tests/tests/five-levels-wildcard/expected_result
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.wtest.com.        IN      A       3600    6.7.8.9
-0      www.a.b.c.d.e.wtest.com.        IN      RRSIG   3600    A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      *.a.b.c.d.e.wtest.com.  IN      NSEC    3600    ns1.wtest.com. A RRSIG NSEC
-1      *.a.b.c.d.e.wtest.com.  IN      RRSIG   3600    NSEC 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.wtest.com.        3600    IN      A       6.7.8.9
+0      www.a.b.c.d.e.wtest.com.        3600    IN      RRSIG   A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      *.a.b.c.d.e.wtest.com.  3600    IN      NSEC    ns1.wtest.com. A RRSIG NSEC
+1      *.a.b.c.d.e.wtest.com.  3600    IN      RRSIG   NSEC 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.wtest.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard/expected_result.narrow b/regression-tests/tests/five-levels-wildcard/expected_result.narrow
index 4825cf61786ce40cf245d904cd1b48889435722c..f7480b1fb1dc02811cbfc4f43eb39ff9faca59d9 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard/expected_result.narrow
+++ b/regression-tests/tests/five-levels-wildcard/expected_result.narrow
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.wtest.com.        IN      A       3600    6.7.8.9
-0      www.a.b.c.d.e.wtest.com.        IN      RRSIG   3600    A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pet5iqbgccga60p2n38nmuanrk50papg.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd PET5IQBGCCGA60P2N38NMUANRK50PAPI
-1      pet5iqbgccga60p2n38nmuanrk50papg.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.wtest.com.        3600    IN      A       6.7.8.9
+0      www.a.b.c.d.e.wtest.com.        3600    IN      RRSIG   A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pet5iqbgccga60p2n38nmuanrk50papg.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd PET5IQBGCCGA60P2N38NMUANRK50PAPI
+1      pet5iqbgccga60p2n38nmuanrk50papg.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.wtest.com.', qtype=A

diff --git a/regression-tests/tests/five-levels-wildcard/expected_result.nsec3 b/regression-tests/tests/five-levels-wildcard/expected_result.nsec3
index 784cdf8503548b10d3f200a86eb10a11da67213f..2b3467e281623f11bd281d0d57c717d958855452 100644 (file)
--- a/regression-tests/tests/five-levels-wildcard/expected_result.nsec3
+++ b/regression-tests/tests/five-levels-wildcard/expected_result.nsec3
@@ -1,7 +1,7 @@
-0      www.a.b.c.d.e.wtest.com.        IN      A       3600    6.7.8.9
-0      www.a.b.c.d.e.wtest.com.        IN      RRSIG   3600    A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      www.a.b.c.d.e.wtest.com.        3600    IN      A       6.7.8.9
+0      www.a.b.c.d.e.wtest.com.        3600    IN      RRSIG   A 13 7 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.b.c.d.e.wtest.com.', qtype=A

diff --git a/regression-tests/tests/glue-record/expected_result b/regression-tests/tests/glue-record/expected_result
index 923da347e2fa0824bd9c482611877ecf51778513..4da9e6738a1cfc1b7b8bed99d235875ac86bf693 100644 (file)
--- a/regression-tests/tests/glue-record/expected_result
+++ b/regression-tests/tests/glue-record/expected_result
@@ -1,6 +1,6 @@
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='usa-ns2.usa.example.com.', qtype=A

diff --git a/regression-tests/tests/glue-referral/expected_result b/regression-tests/tests/glue-referral/expected_result
index 1f0a1362c7ed6df5350b090751953336130b75cf..35243bb11f7331b11bf4d3dfee8e02fa2b24f5e4 100644 (file)
--- a/regression-tests/tests/glue-referral/expected_result
+++ b/regression-tests/tests/glue-referral/expected_result
@@ -1,6 +1,6 @@
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.usa.example.com.', qtype=A

diff --git a/regression-tests/tests/internal-referral/expected_result b/regression-tests/tests/internal-referral/expected_result
index 930c733dfa85d219043a3fd25def66979c37e125..c226aa61730b76d0a2cc63483c1ae0ceab3e992a 100644 (file)
--- a/regression-tests/tests/internal-referral/expected_result
+++ b/regression-tests/tests/internal-referral/expected_result
@@ -1,6 +1,6 @@
-1      italy.example.com.      IN      NS      120     italy-ns1.example.com.
-1      italy.example.com.      IN      NS      120     italy-ns2.example.com.
-2      italy-ns1.example.com.  IN      A       120     192.168.5.1
-2      italy-ns2.example.com.  IN      A       120     192.168.5.2
+1      italy.example.com.      120     IN      NS      italy-ns1.example.com.
+1      italy.example.com.      120     IN      NS      italy-ns2.example.com.
+2      italy-ns1.example.com.  120     IN      A       192.168.5.1
+2      italy-ns2.example.com.  120     IN      A       192.168.5.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.italy.example.com.', qtype=A

diff --git a/regression-tests/tests/largettl/expected_result b/regression-tests/tests/largettl/expected_result
index 60a9f863ce00bfa51d5d60a0325b14e1b394e067..6afbf5ad3458930f5859d04a1dfb2099d3c50888 100644 (file)
--- a/regression-tests/tests/largettl/expected_result
+++ b/regression-tests/tests/largettl/expected_result
@@ -1,3 +1,3 @@
-0      largettl.example.com.   IN      TXT     1073741724      "this record has a huge TTL"
+0      largettl.example.com.   1073741724      IN      TXT     "this record has a huge TTL"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='largettl.example.com.', qtype=TXT

diff --git a/regression-tests/tests/long-name/expected_result b/regression-tests/tests/long-name/expected_result
index 620e73dc9587939ef9093cdf9ae373acab6930b3..4328210d8b103e8a95f7a1d0f3f6d586b37b3fa6 100644 (file)
--- a/regression-tests/tests/long-name/expected_result
+++ b/regression-tests/tests/long-name/expected_result
@@ -1,3 +1,3 @@
-1      test.com.       IN      SOA     3600    ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      test.com.       3600    IN      SOA     ns1.test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.test.com.', qtype=TXT

diff --git a/regression-tests/tests/minimal-noerror/expected_result b/regression-tests/tests/minimal-noerror/expected_result
index b6b65ba3edfc393ffe8271c72b90885ecadd30db..09c5a016a8f12868c2f2f7e8e87b5946ac25f978 100644 (file)
--- a/regression-tests/tests/minimal-noerror/expected_result
+++ b/regression-tests/tests/minimal-noerror/expected_result
@@ -1 +1 @@
-1      minimal.com.    IN      NSEC    120     minimal.com. NS SOA RRSIG NSEC DNSKEY
+1      minimal.com.    120     IN      NSEC    minimal.com. NS SOA RRSIG NSEC DNSKEY

diff --git a/regression-tests/tests/minimal-noerror/expected_result.narrow b/regression-tests/tests/minimal-noerror/expected_result.narrow
index 9ed56088064ddc8a57b8897c286f56df1cc50f33..3cf93cc705cb885fcec06b8d050db19530bcef22 100644 (file)
--- a/regression-tests/tests/minimal-noerror/expected_result.narrow
+++ b/regression-tests/tests/minimal-noerror/expected_result.narrow
@@ -1 +1 @@
-1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9313 NS SOA RRSIG DNSKEY NSEC3PARAM
+1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9313 NS SOA RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/tests/minimal-noerror/expected_result.nsec3 b/regression-tests/tests/minimal-noerror/expected_result.nsec3
index cf388a1c4af9789d2cfda5f8d596c53f5de01d24..f20b684716978775540f88f9d53c2c40d46a4c0e 100644 (file)
--- a/regression-tests/tests/minimal-noerror/expected_result.nsec3
+++ b/regression-tests/tests/minimal-noerror/expected_result.nsec3
@@ -1 +1 @@
-1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9312 NS SOA RRSIG DNSKEY NSEC3PARAM
+1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9312 NS SOA RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/tests/minimal-nxdomain/expected_result b/regression-tests/tests/minimal-nxdomain/expected_result
index b6b65ba3edfc393ffe8271c72b90885ecadd30db..09c5a016a8f12868c2f2f7e8e87b5946ac25f978 100644 (file)
--- a/regression-tests/tests/minimal-nxdomain/expected_result
+++ b/regression-tests/tests/minimal-nxdomain/expected_result
@@ -1 +1 @@
-1      minimal.com.    IN      NSEC    120     minimal.com. NS SOA RRSIG NSEC DNSKEY
+1      minimal.com.    120     IN      NSEC    minimal.com. NS SOA RRSIG NSEC DNSKEY

diff --git a/regression-tests/tests/minimal-nxdomain/expected_result.narrow b/regression-tests/tests/minimal-nxdomain/expected_result.narrow
index 520a244c2c9882d1155b8557002f1d41199de48e..759304daa2fa543cc267a7b2583c01556d86e08e 100644 (file)
--- a/regression-tests/tests/minimal-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/minimal-nxdomain/expected_result.narrow
@@ -1,3 +1,3 @@
-1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9313 NS SOA RRSIG DNSKEY NSEC3PARAM
-1      8hki26qt36v6qs8cll4e4nvjit38uhap.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 8HKI26QT36V6QS8CLL4E4NVJIT38UHAR
-1      9oadfe8c55evko75kb06spdl23p4fmrh.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 9OADFE8C55EVKO75KB06SPDL23P4FMRJ
+1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9313 NS SOA RRSIG DNSKEY NSEC3PARAM
+1      8hki26qt36v6qs8cll4e4nvjit38uhap.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 8HKI26QT36V6QS8CLL4E4NVJIT38UHAR
+1      9oadfe8c55evko75kb06spdl23p4fmrh.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 9OADFE8C55EVKO75KB06SPDL23P4FMRJ

diff --git a/regression-tests/tests/minimal-nxdomain/expected_result.nsec3 b/regression-tests/tests/minimal-nxdomain/expected_result.nsec3
index cf388a1c4af9789d2cfda5f8d596c53f5de01d24..f20b684716978775540f88f9d53c2c40d46a4c0e 100644 (file)
--- a/regression-tests/tests/minimal-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/minimal-nxdomain/expected_result.nsec3
@@ -1 +1 @@
-1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   IN      NSEC3   120     1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9312 NS SOA RRSIG DNSKEY NSEC3PARAM
+1      09lo11rs63u9b3d538a86ijvqcqt9312.minimal.com.   120     IN      NSEC3   1 [flags] 1 abcd 09LO11RS63U9B3D538A86IJVQCQT9312 NS SOA RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/tests/multi-step-cname-resolution/expected_result b/regression-tests/tests/multi-step-cname-resolution/expected_result
index 03733d6044aa51853b84ebbd61f97e5c387b978c..4ffd50f17261d41ee4a7c22128fd9a7d6c1057da 100644 (file)
--- a/regression-tests/tests/multi-step-cname-resolution/expected_result
+++ b/regression-tests/tests/multi-step-cname-resolution/expected_result
@@ -1,6 +1,6 @@
-0      start1.example.com.     IN      CNAME   120     start2.example.com.
-0      start2.example.com.     IN      CNAME   120     start3.example.com.
-0      start3.example.com.     IN      CNAME   120     start4.example.com.
-0      start4.example.com.     IN      A       120     192.168.2.2
+0      start1.example.com.     120     IN      CNAME   start2.example.com.
+0      start2.example.com.     120     IN      CNAME   start3.example.com.
+0      start3.example.com.     120     IN      CNAME   start4.example.com.
+0      start4.example.com.     120     IN      A       192.168.2.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='start1.example.com.', qtype=A

diff --git a/regression-tests/tests/multi-txt-escape-resolution/expected_result b/regression-tests/tests/multi-txt-escape-resolution/expected_result
index 5f0925ea7a2038b6f470c8a3618fd98d5d1f513f..864fb23b5bd2021d1182eae8c2c63692e179ff3c 100644 (file)
--- a/regression-tests/tests/multi-txt-escape-resolution/expected_result
+++ b/regression-tests/tests/multi-txt-escape-resolution/expected_result
@@ -1,3 +1,3 @@
-0      escapedtext.example.com.        IN      TXT     120     "begin" "the \"middle\" p\\art" "the end"
+0      escapedtext.example.com.        120     IN      TXT     "begin" "the \"middle\" p\\art" "the end"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='escapedtext.example.com.', qtype=TXT

diff --git a/regression-tests/tests/multi-txt-resolution/expected_result b/regression-tests/tests/multi-txt-resolution/expected_result
index 5134e4d859eb6643fef7fd0b884396c7af1ac145..5de53b45e1385b3fa8d91be2dcb30ea80afcc366 100644 (file)
--- a/regression-tests/tests/multi-txt-resolution/expected_result
+++ b/regression-tests/tests/multi-txt-resolution/expected_result
@@ -1,3 +1,3 @@
-0      multitext.example.com.  IN      TXT     120     "text part one" "text part two" "text part three"
+0      multitext.example.com.  120     IN      TXT     "text part one" "text part two" "text part three"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='multitext.example.com.', qtype=TXT

diff --git a/regression-tests/tests/mx-case-sensitivy-with-ap/expected_result b/regression-tests/tests/mx-case-sensitivy-with-ap/expected_result
index b242aeae488314019bb711f24a83398c5836eae8..6472552a87f2a7fa95840dee53b11b49fe97a727 100644 (file)
--- a/regression-tests/tests/mx-case-sensitivy-with-ap/expected_result
+++ b/regression-tests/tests/mx-case-sensitivy-with-ap/expected_result
@@ -1,7 +1,7 @@
-0      exAmplE.com.    IN      MX      120     10 smtp-servers.exAmplE.com.
-0      exAmplE.com.    IN      MX      120     15 smtp-servers.test.com.
-2      smtp-servers.exAmplE.com.       IN      A       120     192.168.0.2
-2      smtp-servers.exAmplE.com.       IN      A       120     192.168.0.3
-2      smtp-servers.exAmplE.com.       IN      A       120     192.168.0.4
+0      exAmplE.com.    120     IN      MX      10 smtp-servers.exAmplE.com.
+0      exAmplE.com.    120     IN      MX      15 smtp-servers.test.com.
+2      smtp-servers.exAmplE.com.       120     IN      A       192.168.0.2
+2      smtp-servers.exAmplE.com.       120     IN      A       192.168.0.3
+2      smtp-servers.exAmplE.com.       120     IN      A       192.168.0.4
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='exAmplE.com.', qtype=MX

diff --git a/regression-tests/tests/mx-to-cname/expected_result b/regression-tests/tests/mx-to-cname/expected_result
index d2a60ab8596f5150caea26c505cacd7efda790eb..d4e39cf5c843cc61910227f5e76d8a08672bb48c 100644 (file)
--- a/regression-tests/tests/mx-to-cname/expected_result
+++ b/regression-tests/tests/mx-to-cname/expected_result
@@ -1,3 +1,3 @@
-0      mail.example.com.       IN      MX      120     25 smtp1.example.com.
+0      mail.example.com.       120     IN      MX      25 smtp1.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='mail.example.com.', qtype=MX

diff --git a/regression-tests/tests/mx-with-simple-additional-processing/expected_result b/regression-tests/tests/mx-with-simple-additional-processing/expected_result
index 19981306308f27ee03f2dabe7395a69d019dd3e2..fc1ecc4adf696b3117d8268d2209b71455f73fc6 100644 (file)
--- a/regression-tests/tests/mx-with-simple-additional-processing/expected_result
+++ b/regression-tests/tests/mx-with-simple-additional-processing/expected_result
@@ -1,7 +1,7 @@
-0      example.com.    IN      MX      120     10 smtp-servers.example.com.
-0      example.com.    IN      MX      120     15 smtp-servers.test.com.
-2      smtp-servers.example.com.       IN      A       120     192.168.0.2
-2      smtp-servers.example.com.       IN      A       120     192.168.0.3
-2      smtp-servers.example.com.       IN      A       120     192.168.0.4
+0      example.com.    120     IN      MX      10 smtp-servers.example.com.
+0      example.com.    120     IN      MX      15 smtp-servers.test.com.
+2      smtp-servers.example.com.       120     IN      A       192.168.0.2
+2      smtp-servers.example.com.       120     IN      A       192.168.0.3
+2      smtp-servers.example.com.       120     IN      A       192.168.0.4
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=MX

diff --git a/regression-tests/tests/naptr/expected_result b/regression-tests/tests/naptr/expected_result
index d154728f4d728aef8da2efe08852eb8eb1aaaa4e..4a4aa625613d64c0a640ec48dafb3b4bbe5d6e14 100644 (file)
--- a/regression-tests/tests/naptr/expected_result
+++ b/regression-tests/tests/naptr/expected_result
@@ -1,3 +1,3 @@
-0      enum.test.com.  IN      NAPTR   3600    100 50 "u" "e2u+sip" "" testuser.domain.com.
+0      enum.test.com.  3600    IN      NAPTR   100 50 "u" "e2u+sip" "" testuser.domain.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='enum.test.com.', qtype=NAPTR

diff --git a/regression-tests/tests/no-out-of-zone-data/expected_result b/regression-tests/tests/no-out-of-zone-data/expected_result
index 22664113817935fcca137928d3197246b5114d96..52239fc20bb5b1925895352049a4ea0ae088a7d6 100644 (file)
--- a/regression-tests/tests/no-out-of-zone-data/expected_result
+++ b/regression-tests/tests/no-out-of-zone-data/expected_result
@@ -1,3 +1,3 @@
-0      _imap._tcp.example.com. IN      SRV     120     0 1 143 blah.test.com.
+0      _imap._tcp.example.com. 120     IN      SRV     0 1 143 blah.test.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='_imap._tcp.example.com.', qtype=SRV

diff --git a/regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result b/regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result
index 205bb4ef922e26606cf4c1ab977484ff8ca8a535..1608fa73cbfa835b1a83ce7f6489fecd5275fc13 100644 (file)
--- a/regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result
+++ b/regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result
@@ -1,3 +1,3 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.example.com.', qtype=AAAA

diff --git a/regression-tests/tests/non-existing-record-other-types-exist/expected_result b/regression-tests/tests/non-existing-record-other-types-exist/expected_result
index e2b5772d8c884be59be33d299b1f395a61de9a7a..b04f09e0bc145326ebdbf977bc654552bbaaea3a 100644 (file)
--- a/regression-tests/tests/non-existing-record-other-types-exist/expected_result
+++ b/regression-tests/tests/non-existing-record-other-types-exist/expected_result
@@ -1,3 +1,3 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=AAAA

diff --git a/regression-tests/tests/ns-at-delegation/expected_result b/regression-tests/tests/ns-at-delegation/expected_result
index 70b292c60e2275ade924a739e323a7211b1cce6f..a0df396741805a74d9eaf414b07e01cee05b011f 100644 (file)
--- a/regression-tests/tests/ns-at-delegation/expected_result
+++ b/regression-tests/tests/ns-at-delegation/expected_result
@@ -1,6 +1,6 @@
-1      usa.example.com.        IN      NS      120     usa-ns1.usa.example.com.
-1      usa.example.com.        IN      NS      120     usa-ns2.usa.example.com.
-2      usa-ns1.usa.example.com.        IN      A       120     192.168.4.1
-2      usa-ns2.usa.example.com.        IN      A       120     192.168.4.2
+1      usa.example.com.        120     IN      NS      usa-ns1.usa.example.com.
+1      usa.example.com.        120     IN      NS      usa-ns2.usa.example.com.
+2      usa-ns1.usa.example.com.        120     IN      A       192.168.4.1
+2      usa-ns2.usa.example.com.        120     IN      A       192.168.4.2
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='usa.example.com.', qtype=NS

diff --git a/regression-tests/tests/ns-with-identical-glue/expected_result b/regression-tests/tests/ns-with-identical-glue/expected_result
index c2ab01351a43e39206996210040c606ce82cf161..46cf5fdc5a3a4f4eb983b9e1d3f78a87065703c7 100644 (file)
--- a/regression-tests/tests/ns-with-identical-glue/expected_result
+++ b/regression-tests/tests/ns-with-identical-glue/expected_result
@@ -1,4 +1,4 @@
-1      blah.test.com.  IN      NS      3600    blah.test.com.
-2      blah.test.com.  IN      A       3600    192.168.6.1
+1      blah.test.com.  3600    IN      NS      blah.test.com.
+2      blah.test.com.  3600    IN      A       192.168.6.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='blah.test.com.', qtype=MX

diff --git a/regression-tests/tests/nsec-bitmap/expected_result b/regression-tests/tests/nsec-bitmap/expected_result
index cdd640e012d96865faa939196efa95e59ba519e0..277ef573496447365aa29d26a83e97acf8d0bc3e 100644 (file)
--- a/regression-tests/tests/nsec-bitmap/expected_result
+++ b/regression-tests/tests/nsec-bitmap/expected_result
@@ -1,5 +1,5 @@
-0      hightype.example.com.   IN      NSEC    86400   host-0.example.com. A RRSIG NSEC TYPE65534
-0      hightype.example.com.   IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+0      hightype.example.com.   86400   IN      NSEC    host-0.example.com. A RRSIG NSEC TYPE65534
+0      hightype.example.com.   86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hightype.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-bitmap/expected_result.narrow b/regression-tests/tests/nsec-bitmap/expected_result.narrow
index eebaa97ce8d982c171cc5e9885bae7b29bc10d9b..7375b5bf621deb00968cb6e36ce72396e137c1e5 100644 (file)
--- a/regression-tests/tests/nsec-bitmap/expected_result.narrow
+++ b/regression-tests/tests/nsec-bitmap/expected_result.narrow
@@ -1,7 +1,7 @@
-1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 3V4IT454KFH142BI7AFAGNUVIGRPFPTU A RRSIG TYPE65534
-1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 3V4IT454KFH142BI7AFAGNUVIGRPFPTU A RRSIG TYPE65534
+1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hightype.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-bitmap/expected_result.nsec3 b/regression-tests/tests/nsec-bitmap/expected_result.nsec3
index f4521b53e48ca5d722a55ffc969fd5a6362e69cc..3db625f3dddd5520456572ad83b471cf5855d126 100644 (file)
--- a/regression-tests/tests/nsec-bitmap/expected_result.nsec3
+++ b/regression-tests/tests/nsec-bitmap/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 3V4S43RV1GT28N0F2PPJ8I8482ESMUOB A RRSIG TYPE65534
-1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 3V4S43RV1GT28N0F2PPJ8I8482ESMUOB A RRSIG TYPE65534
+1      3v4it454kfh142bi7afagnuvigrpfptt.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='hightype.example.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-glue-at-delegation/expected_result b/regression-tests/tests/nsec-glue-at-delegation/expected_result
index b60d97b1ba1a6f0e52f1a988cb5057051b480552..b33b48694b9ed7a044f0031e3ed6eebe51304d2c 100644 (file)
--- a/regression-tests/tests/nsec-glue-at-delegation/expected_result
+++ b/regression-tests/tests/nsec-glue-at-delegation/expected_result
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NS      3600    blah.test.com.
-1      blah.test.com.  IN      NSEC    3600    b.c.test.com. NS RRSIG NSEC
-1      blah.test.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
-2      blah.test.com.  IN      A       3600    192.168.6.1
+1      blah.test.com.  3600    IN      NS      blah.test.com.
+1      blah.test.com.  3600    IN      NSEC    b.c.test.com. NS RRSIG NSEC
+1      blah.test.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
+2      blah.test.com.  3600    IN      A       192.168.6.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='blah.test.com.', qtype=MX

diff --git a/regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow b/regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow
index 3d22be6863e642bc0937dbd963198146265a5e93..6e93adfdd3a3c7fc78810af48aa65899a82ff451 100644 (file)
--- a/regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow
+++ b/regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NS      3600    blah.test.com.
-1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      IN      NSEC3   3600    1 1 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KC NS
-1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
-2      blah.test.com.  IN      A       3600    192.168.6.1
+1      blah.test.com.  3600    IN      NS      blah.test.com.
+1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      3600    IN      NSEC3   1 1 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KC NS
+1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
+2      blah.test.com.  3600    IN      A       192.168.6.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='blah.test.com.', qtype=MX

diff --git a/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3 b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3
index 372079be226e22db5e9d4e13ff0d960f2675b703..7f364a3465f144d9250b05b65f4cc196894fc335 100644 (file)
--- a/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3
+++ b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      blah.test.com.  IN      NS      3600    blah.test.com.
-1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      IN      NSEC3   3600    1 0 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA NS
-1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
-2      blah.test.com.  IN      A       3600    192.168.6.1
+1      blah.test.com.  3600    IN      NS      blah.test.com.
+1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      3600    IN      NSEC3   1 0 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA NS
+1      s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
+2      blah.test.com.  3600    IN      A       192.168.6.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='blah.test.com.', qtype=MX

diff --git a/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout
index 97495f46ac03a460c06b059d07774015ca8d3e4c..24f2973b9b316a2da304144e9d447324e9a32a3b 100644 (file)
--- a/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout
+++ b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout
@@ -1,9 +1,9 @@
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      IN      NSEC3   3600    1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      blah.test.com.  IN      NS      3600    blah.test.com.
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      NSEC3   3600    1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
-1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
-2      blah.test.com.  IN      A       3600    192.168.6.1
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      3600    IN      NSEC3   1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      blah.test.com.  3600    IN      NS      blah.test.com.
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      NSEC3   1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA
+1      s6g5shc1jvovl5fl9e943adlonqln7g4.test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
+2      blah.test.com.  3600    IN      A       192.168.6.1
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='blah.test.com.', qtype=MX

diff --git a/regression-tests/tests/nsec-glue/expected_result b/regression-tests/tests/nsec-glue/expected_result
index f3879c9a188b9678d67bf080032772a252f1c08d..1392289daa2ff0447ead04124c4a7df466bc0787 100644 (file)
--- a/regression-tests/tests/nsec-glue/expected_result
+++ b/regression-tests/tests/nsec-glue/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      usa.example.com.        IN      NSEC    86400   *.w1.example.com. NS RRSIG NSEC
-1      usa.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      usa.example.com.        86400   IN      NSEC    *.w1.example.com. NS RRSIG NSEC
+1      usa.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usazzz.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-glue/expected_result.narrow b/regression-tests/tests/nsec-glue/expected_result.narrow
index f9f08ef6d4628b593a3a746804561e6ceb2495cf..25b768b0bec3d0398059d6e25392b8d8f631ded1 100644 (file)
--- a/regression-tests/tests/nsec-glue/expected_result.narrow
+++ b/regression-tests/tests/nsec-glue/expected_result.narrow
@@ -1,11 +1,11 @@
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      kt3ll2fgp7p2s71mk7frk5igi8pc8gl1.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd KT3LL2FGP7P2S71MK7FRK5IGI8PC8GL3
-1      kt3ll2fgp7p2s71mk7frk5igi8pc8gl1.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      kt3ll2fgp7p2s71mk7frk5igi8pc8gl1.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd KT3LL2FGP7P2S71MK7FRK5IGI8PC8GL3
+1      kt3ll2fgp7p2s71mk7frk5igi8pc8gl1.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usazzz.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-glue/expected_result.nsec3 b/regression-tests/tests/nsec-glue/expected_result.nsec3
index 99d3e7db962968b652e724ec6af48fa3d9b7db94..de64c157eb56903ddfff55ed7e79e85aed6ac509 100644 (file)
--- a/regression-tests/tests/nsec-glue/expected_result.nsec3
+++ b/regression-tests/tests/nsec-glue/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      kt0pu1qu9of4ek09a6amheu1l4c4dq6b.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd KT832M4L92B5MCUCJI8QJF16MM2DU3MK A RRSIG
-1      kt0pu1qu9of4ek09a6amheu1l4c4dq6b.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      kt0pu1qu9of4ek09a6amheu1l4c4dq6b.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd KT832M4L92B5MCUCJI8QJF16MM2DU3MK A RRSIG
+1      kt0pu1qu9of4ek09a6amheu1l4c4dq6b.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='usazzz.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-middle/expected_result b/regression-tests/tests/nsec-middle/expected_result
index fb2388fde1c3357fc7e7773491ffdcf04d3b3216..bdc74f9668264269100c0a81b285078549d42875 100644 (file)
--- a/regression-tests/tests/nsec-middle/expected_result
+++ b/regression-tests/tests/nsec-middle/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      nxd.example.com.        IN      NSEC    86400   outpost.example.com. CNAME RRSIG NSEC
-1      nxd.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      nxd.example.com.        86400   IN      NSEC    outpost.example.com. CNAME RRSIG NSEC
+1      nxd.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-middle/expected_result.narrow b/regression-tests/tests/nsec-middle/expected_result.narrow
index a03847d83854fefebe6d344fcca4d19026293a33..56fa9fbc06d496d6f668fa5f2815917b80d89bcf 100644 (file)
--- a/regression-tests/tests/nsec-middle/expected_result.narrow
+++ b/regression-tests/tests/nsec-middle/expected_result.narrow
@@ -1,11 +1,11 @@
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      sthvu2kihc96kc1tu8v3curr8og5dghn.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd STHVU2KIHC96KC1TU8V3CURR8OG5DGHP
-1      sthvu2kihc96kc1tu8v3curr8og5dghn.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      sthvu2kihc96kc1tu8v3curr8og5dghn.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd STHVU2KIHC96KC1TU8V3CURR8OG5DGHP
+1      sthvu2kihc96kc1tu8v3curr8og5dghn.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-middle/expected_result.nsec3 b/regression-tests/tests/nsec-middle/expected_result.nsec3
index f3d2c62b608a3438c89ff8662622b60f5c860839..aec10682d18abab92b7e396d44ba2e41abe0c3d9 100644 (file)
--- a/regression-tests/tests/nsec-middle/expected_result.nsec3
+++ b/regression-tests/tests/nsec-middle/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      sthkgrndv06hbdrfe7a329lup4mctmqr.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd STKPKJBN0URUBBIM832MF33V5OGJR396 A RRSIG
-1      sthkgrndv06hbdrfe7a329lup4mctmqr.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      sthkgrndv06hbdrfe7a329lup4mctmqr.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd STKPKJBN0URUBBIM832MF33V5OGJR396 A RRSIG
+1      sthkgrndv06hbdrfe7a329lup4mctmqr.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-upcase/expected_result b/regression-tests/tests/nsec-upcase/expected_result
index fc26daf2aa5d0b81f0fad1dd6c77ec6d99e573b0..53614a540f0db2108db3fb3c817ca0130482bbd8 100644 (file)
--- a/regression-tests/tests/nsec-upcase/expected_result
+++ b/regression-tests/tests/nsec-upcase/expected_result
@@ -1,5 +1,5 @@
-0      ns1.dnssec-parent.com.  IN      NSEC    3600    ns2.dnssec-parent.com. A RRSIG NSEC
-0      ns1.dnssec-parent.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      ns1.dnssec-parent.com.  3600    IN      NSEC    ns2.dnssec-parent.com. A RRSIG NSEC
+0      ns1.dnssec-parent.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.dnssec-parent.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-upcase/expected_result.narrow b/regression-tests/tests/nsec-upcase/expected_result.narrow
index 79d4f60a18a949aae84e8293306413b5aab7e83e..f147abe5a98c926a7dca34056fee77c6d0d5e57c 100644 (file)
--- a/regression-tests/tests/nsec-upcase/expected_result.narrow
+++ b/regression-tests/tests/nsec-upcase/expected_result.narrow
@@ -1,7 +1,7 @@
-1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     IN      NSEC3   3600    1 [flags] 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR55 A RRSIG
-1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     3600    IN      NSEC3   1 [flags] 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR55 A RRSIG
+1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.dnssec-parent.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-upcase/expected_result.nsec3 b/regression-tests/tests/nsec-upcase/expected_result.nsec3
index 17a8b3a612538d3cc8f065d1d8f335e0da9109dd..c650c18c4ed61e1ad64fcc1e80a8d24161385fea 100644 (file)
--- a/regression-tests/tests/nsec-upcase/expected_result.nsec3
+++ b/regression-tests/tests/nsec-upcase/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     IN      NSEC3   3600    1 [flags] 1 abcd 29CEQCF4EKGL2GR9I0VJJTK62H5LQS40 A RRSIG
-1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     3600    IN      NSEC3   1 [flags] 1 abcd 29CEQCF4EKGL2GR9I0VJJTK62H5LQS40 A RRSIG
+1      1scaqa30lq0do5eirne4kpjfbebfgr54.dnssec-parent.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      3600    IN      SOA     ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ns1.dnssec-parent.com.', qtype=NSEC

diff --git a/regression-tests/tests/nsec-wildcard/expected_result b/regression-tests/tests/nsec-wildcard/expected_result
index cb01e40379ef28ac0eefc6a48bbae201829b4da1..88f21b089d6c97504bd302d63a487099f1937338 100644 (file)
--- a/regression-tests/tests/nsec-wildcard/expected_result
+++ b/regression-tests/tests/nsec-wildcard/expected_result
@@ -1,9 +1,9 @@
-1      *.something.wtest.com.  IN      NSEC    3600    a.something.wtest.com. A RRSIG NSEC
-1      *.something.wtest.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      *.something.wtest.com.  3600    IN      NSEC    a.something.wtest.com. A RRSIG NSEC
+1      *.something.wtest.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='t.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wildcard/expected_result.narrow b/regression-tests/tests/nsec-wildcard/expected_result.narrow
index fa50ff29ab0fe865e7eea03e999a3a0b3ec77e06..28d8dcb3ffdf532c1d9cb494cabdabc83978133d 100644 (file)
--- a/regression-tests/tests/nsec-wildcard/expected_result.narrow
+++ b/regression-tests/tests/nsec-wildcard/expected_result.narrow
@@ -1,11 +1,11 @@
-1      368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 368R0S1Q794JMKDRCPF6F85V316HD9AM
-1      368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd PD15QDSJJBFOSU5FG2OQRNLB8R8OIFL7 A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 368R0S1Q794JMKDRCPF6F85V316HD9AM
+1      368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd PD15QDSJJBFOSU5FG2OQRNLB8R8OIFL7 A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='t.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wildcard/expected_result.nsec3 b/regression-tests/tests/nsec-wildcard/expected_result.nsec3
index 281dea6d91f68943cc992469eab8924283729717..6228883503256a30203335be3c7c60bf213688db 100644 (file)
--- a/regression-tests/tests/nsec-wildcard/expected_result.nsec3
+++ b/regression-tests/tests/nsec-wildcard/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 53I5J7TGM8QG2GBV716RVQVARQCIJUE2 A RRSIG
-1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 53I5J7TGM8QG2GBV716RVQVARQCIJUE2 A RRSIG
+1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='t.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wraparound/expected_result b/regression-tests/tests/nsec-wraparound/expected_result
index 4d7890d937249399b0d2fbc1f7544cf8df9bda93..f3c4d305682c02422014cd8cf7bc8a56973e37ca 100644 (file)
--- a/regression-tests/tests/nsec-wraparound/expected_result
+++ b/regression-tests/tests/nsec-wraparound/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      www.example.com.        IN      NSEC    86400   example.com. CNAME RRSIG NSEC
-1      www.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      www.example.com.        86400   IN      NSEC    example.com. CNAME RRSIG NSEC
+1      www.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-wraparound/expected_result.nsec3 b/regression-tests/tests/nsec-wraparound/expected_result.nsec3
index 2515dc88e40c16b979bcd722cadf5e9b6aaf432c..53fb1fec7ca04c22bb18a13bd3aa1d1692ab5da3 100644 (file)
--- a/regression-tests/tests/nsec-wraparound/expected_result.nsec3
+++ b/regression-tests/tests/nsec-wraparound/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
-1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
index 740a02be5bb47f2b47b4bbb82a080aa36f8e3ada..51978a814269ffdbace234d0421ea32ea2e40e3a 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
+++ b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow
index 9be8a7d7de90ef797726b851b9cf70acac5fa5df..9076124cd2000d237ad55790864103eda328c8df 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow
+++ b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3 b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3
index e011352568dcbe9f628dc4195de3d0bd858163cd..aeed05f5e48185824d220406aa9d363671a67744 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3
+++ b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wrong-type/expected_result b/regression-tests/tests/nsec-wrong-type/expected_result
index 24b47e2eccb0d616de3dbb50e617a98bba0239a4..0a99e7d4022b76e63e9826e8b8ef42f248d52a08 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type/expected_result
+++ b/regression-tests/tests/nsec-wrong-type/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      outpost.example.com.    IN      NSEC    86400   rhs-at-expansion.example.com. A RRSIG NSEC
-1      outpost.example.com.    IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      outpost.example.com.    86400   IN      NSEC    rhs-at-expansion.example.com. A RRSIG NSEC
+1      outpost.example.com.    86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wrong-type/expected_result.narrow b/regression-tests/tests/nsec-wrong-type/expected_result.narrow
index dc42f98bfafe167ea451cff3ec4e01c1a67d1447..5695eba5e71de219f31607d43638bbe858bcfd8f 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type/expected_result.narrow
+++ b/regression-tests/tests/nsec-wrong-type/expected_result.narrow
@@ -1,7 +1,7 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec-wrong-type/expected_result.nsec3 b/regression-tests/tests/nsec-wrong-type/expected_result.nsec3
index d2b1f6a52a739b0d579b039b96c4fc025b9d38e9..5628d70267902dc6e87b094a7e340ed10b850004 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type/expected_result.nsec3
+++ b/regression-tests/tests/nsec-wrong-type/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=TXT

diff --git a/regression-tests/tests/nsec3-hash-query/expected_result b/regression-tests/tests/nsec3-hash-query/expected_result
index 322427636bc1b96fba83e4b7977d794941e38a5f..a6ffacde201c67717601d39047248173423f7a24 100644 (file)
--- a/regression-tests/tests/nsec3-hash-query/expected_result
+++ b/regression-tests/tests/nsec3-hash-query/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
index 8e50e4953392dfc26394d59a593e0aaf0799f362..3f56c3edb30c47c8367ce9b3e85df29bafb308ba 100644 (file)
--- a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
+++ b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      usa.example.com.        IN      NSEC    86400   *.w1.example.com. NS RRSIG NSEC
-1      usa.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      usa.example.com.        86400   IN      NSEC    *.w1.example.com. NS RRSIG NSEC
+1      usa.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec3-hash-query/expected_result.narrow b/regression-tests/tests/nsec3-hash-query/expected_result.narrow
index b3214e29edda4c3215b79ac5313fe53a966f4f9e..2e06b0f89ca8e1b19041f8668ab7fb6a11785340 100644 (file)
--- a/regression-tests/tests/nsec3-hash-query/expected_result.narrow
+++ b/regression-tests/tests/nsec3-hash-query/expected_result.narrow
@@ -1,11 +1,11 @@
-1      1a140bgusgdcs1r19730hkq46r7bffq8.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 1A140BGUSGDCS1R19730HKQ46R7BFFQA
-1      1a140bgusgdcs1r19730hkq46r7bffq8.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      1a140bgusgdcs1r19730hkq46r7bffq8.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 1A140BGUSGDCS1R19730HKQ46R7BFFQA
+1      1a140bgusgdcs1r19730hkq46r7bffq8.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.', qtype=A

diff --git a/regression-tests/tests/nsec3-hash-query/expected_result.nsec3 b/regression-tests/tests/nsec3-hash-query/expected_result.nsec3
index e19231a32a4e228e55fda253a975e94be102030d..41e616324c614810d3b32fe8c379957575c16e87 100644 (file)
--- a/regression-tests/tests/nsec3-hash-query/expected_result.nsec3
+++ b/regression-tests/tests/nsec3-hash-query/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      1a0gisil40k7t5sedn514s889mmi96kn.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 1A3V0V070LETVUTCAHLH0EQ5K5PQ8M4M A RRSIG
-1      1a0gisil40k7t5sedn514s889mmi96kn.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      1a0gisil40k7t5sedn514s889mmi96kn.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 1A3V0V070LETVUTCAHLH0EQ5K5PQ8M4M A RRSIG
+1      1a0gisil40k7t5sedn514s889mmi96kn.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result
index 207500a983675ab2f703085ce15a6912c07c6de1..2f29f5f01828b2f8f4b518cfef9e1f3d0001e9d8 100644 (file)
--- a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result
+++ b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result
@@ -1,9 +1,9 @@
-1      *.something.wtest.com.  IN      NSEC    3600    a.something.wtest.com. A RRSIG NSEC
-1      *.something.wtest.com.  IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      *.something.wtest.com.  3600    IN      NSEC    a.something.wtest.com. A RRSIG NSEC
+1      *.something.wtest.com.  3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow
index c5fd82aa5f9c565a4aef757411995126884bc21f..449b61cc7f44eb993bd5f849c58a503ddd7c469b 100644 (file)
--- a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow
+++ b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow
@@ -1,11 +1,11 @@
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd D0RJLF3TFUL8JFJK86VI5CE50NUEA9A8
-1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd PD15QDSJJBFOSU5FG2OQRNLB8R8OIFL7 A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd D0RJLF3TFUL8JFJK86VI5CE50NUEA9A8
+1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd PD15QDSJJBFOSU5FG2OQRNLB8R8OIFL7 A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3
index cc2161664ed1f3b7747bcad53d4a301b691e1d25..f9fa5deff6ce165d3f5d793090d8be419760650c 100644 (file)
--- a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3
+++ b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G
-1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd J02K7MH36PLGFKRS6UTOCESCCQ5P7EOB A RRSIG
-1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-2      .       IN      OPT     32768   
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G
+1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd J02K7MH36PLGFKRS6UTOCESCCQ5P7EOB A RRSIG
+1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=TXT

diff --git a/regression-tests/tests/nsecx-mode3-wildcard/expected_result b/regression-tests/tests/nsecx-mode3-wildcard/expected_result
index 4ea55835d00b42549fceab90a781546b792dcc89..c66f7396581c0d8b4db42088e8f99bf738d1b00e 100644 (file)
--- a/regression-tests/tests/nsecx-mode3-wildcard/expected_result
+++ b/regression-tests/tests/nsecx-mode3-wildcard/expected_result
@@ -1,7 +1,7 @@
-0      second.first.something.wtest.com.       IN      A       3600    4.3.2.1
-0      second.first.something.wtest.com.       IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      second.first.something.wtest.com.       3600    IN      A       4.3.2.1
+0      second.first.something.wtest.com.       3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow
index fa3be13c5c3c4a431db2f03d533937886c41369b..fbbb0a80ee5162ecfdbd3cc2dbcf5804573e77b1 100644 (file)
--- a/regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow
+++ b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow
@@ -1,7 +1,7 @@
-0      second.first.something.wtest.com.       IN      A       3600    4.3.2.1
-0      second.first.something.wtest.com.       IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd D0RJLF3TFUL8JFJK86VI5CE50NUEA9A8
-1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      second.first.something.wtest.com.       3600    IN      A       4.3.2.1
+0      second.first.something.wtest.com.       3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd D0RJLF3TFUL8JFJK86VI5CE50NUEA9A8
+1      d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3 b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3
index 4e0f5adeed0eb298707db2b22c8578d4a1b99b98..fd7e0353f1dd7f9c7345d36d54fe38c84e668c9b 100644 (file)
--- a/regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3
+++ b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3
@@ -1,7 +1,7 @@
-0      second.first.something.wtest.com.       IN      A       3600    4.3.2.1
-0      second.first.something.wtest.com.       IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd J02K7MH36PLGFKRS6UTOCESCCQ5P7EOB A RRSIG
-1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      second.first.something.wtest.com.       3600    IN      A       4.3.2.1
+0      second.first.something.wtest.com.       3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd J02K7MH36PLGFKRS6UTOCESCCQ5P7EOB A RRSIG
+1      cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='second.first.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-upcase/expected_result b/regression-tests/tests/nsecx-upcase/expected_result
index 0372662222cddc62c4804ea1697a1baa691732de..5629c94ff25add8fef1d110d6afea97be006bb9a 100644 (file)
--- a/regression-tests/tests/nsecx-upcase/expected_result
+++ b/regression-tests/tests/nsecx-upcase/expected_result
@@ -1,9 +1,9 @@
-0      Z1234567890.wtest.com.  IN      CNAME   3600    server1.wtest.com.
-0      Z1234567890.wtest.com.  IN      RRSIG   3600    CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-0      server1.wtest.com.      IN      A       3600    1.2.3.4
-0      server1.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      a.something.wtest.com.  IN      NSEC    3600    wtest.com. A RRSIG NSEC
-1      a.something.wtest.com.  IN      RRSIG   3600    NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      Z1234567890.wtest.com.  3600    IN      CNAME   server1.wtest.com.
+0      Z1234567890.wtest.com.  3600    IN      RRSIG   CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+0      server1.wtest.com.      3600    IN      A       1.2.3.4
+0      server1.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      a.something.wtest.com.  3600    IN      NSEC    wtest.com. A RRSIG NSEC
+1      a.something.wtest.com.  3600    IN      RRSIG   NSEC 13 4 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='Z1234567890.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-upcase/expected_result.narrow b/regression-tests/tests/nsecx-upcase/expected_result.narrow
index da2ae323b2c3c5ac9d582e26a8c8945d27215f29..da6f827d4ab496ab5e693ab35d87143d617560a8 100644 (file)
--- a/regression-tests/tests/nsecx-upcase/expected_result.narrow
+++ b/regression-tests/tests/nsecx-upcase/expected_result.narrow
@@ -1,9 +1,9 @@
-0      Z1234567890.wtest.com.  IN      CNAME   3600    server1.wtest.com.
-0      Z1234567890.wtest.com.  IN      RRSIG   3600    CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-0      server1.wtest.com.      IN      A       3600    1.2.3.4
-0      server1.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pv38thf7bl9rb2o5cf77jkuehfupln6u.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd PV38THF7BL9RB2O5CF77JKUEHFUPLN70
-1      pv38thf7bl9rb2o5cf77jkuehfupln6u.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      Z1234567890.wtest.com.  3600    IN      CNAME   server1.wtest.com.
+0      Z1234567890.wtest.com.  3600    IN      RRSIG   CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+0      server1.wtest.com.      3600    IN      A       1.2.3.4
+0      server1.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pv38thf7bl9rb2o5cf77jkuehfupln6u.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd PV38THF7BL9RB2O5CF77JKUEHFUPLN70
+1      pv38thf7bl9rb2o5cf77jkuehfupln6u.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='Z1234567890.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nsecx-upcase/expected_result.nsec3 b/regression-tests/tests/nsecx-upcase/expected_result.nsec3
index e5bc2afda140c0219b09964b14b17fe13b6ad5c3..1708f6d711e145ef753f13fc7de41b25bacb27b7 100644 (file)
--- a/regression-tests/tests/nsecx-upcase/expected_result.nsec3
+++ b/regression-tests/tests/nsecx-upcase/expected_result.nsec3
@@ -1,9 +1,9 @@
-0      Z1234567890.wtest.com.  IN      CNAME   3600    server1.wtest.com.
-0      Z1234567890.wtest.com.  IN      RRSIG   3600    CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
-0      server1.wtest.com.      IN      A       3600    1.2.3.4
-0      server1.wtest.com.      IN      RRSIG   3600    A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      NSEC3   3600    1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
-1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
-2      .       IN      OPT     32768   
+0      Z1234567890.wtest.com.  3600    IN      CNAME   server1.wtest.com.
+0      Z1234567890.wtest.com.  3600    IN      RRSIG   CNAME 13 2 3600 [expiry] [inception] [keytag] wtest.com. ...
+0      server1.wtest.com.      3600    IN      A       1.2.3.4
+0      server1.wtest.com.      3600    IN      RRSIG   A 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      NSEC3   1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG
+1      pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com.     3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] wtest.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='Z1234567890.wtest.com.', qtype=A

diff --git a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result
index 377eef2e2bfc89da9bc810e91742e0448dbf2061..7cb1b15403411e0f3a9a4578bf7af5e85456aebd 100644 (file)
--- a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result
+++ b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      outpost.example.com.    IN      NSEC    86400   rhs-at-expansion.example.com. A RRSIG NSEC
-1      outpost.example.com.    IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      outpost.example.com.    86400   IN      NSEC    rhs-at-expansion.example.com. A RRSIG NSEC
+1      outpost.example.com.    86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow
index b6f29e82e1454ba03b65bb528a7f1e67c483af76..612fab6c9ffc70b60e217193eac864b9e80d7efa 100644 (file)
--- a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow
+++ b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow
@@ -1,11 +1,11 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      sdgbafmjek5v4t8c89q9u0n03qmcslor.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd SDGBAFMJEK5V4T8C89Q9U0N03QMCSLOT
-1      sdgbafmjek5v4t8c89q9u0n03qmcslor.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd TSDP8HAJLFGR90CV4IB634G1M25NC5UR
-1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      sdgbafmjek5v4t8c89q9u0n03qmcslor.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd SDGBAFMJEK5V4T8C89Q9U0N03QMCSLOT
+1      sdgbafmjek5v4t8c89q9u0n03qmcslor.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd TSDP8HAJLFGR90CV4IB634G1M25NC5UR
+1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3 b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3
index 91d316da846978cd4b556e0235cf24049313d83e..8ef66775bb549db9118ccc6e563a75885953541c 100644 (file)
--- a/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3
+++ b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      sdeu4ba3b451gf8ijikm2tphu3bugl4g.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd SDH8FVJ6LQLSVCQCO8QP82I6JTR574H2 A RRSIG
-1      sdeu4ba3b451gf8ijikm2tphu3bugl4g.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd TSIKPRKTT53V9ILUK08SMR9KADQ44TR1 A RRSIG
-1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      sdeu4ba3b451gf8ijikm2tphu3bugl4g.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd SDH8FVJ6LQLSVCQCO8QP82I6JTR574H2 A RRSIG
+1      sdeu4ba3b451gf8ijikm2tphu3bugl4g.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd TSIKPRKTT53V9ILUK08SMR9KADQ44TR1 A RRSIG
+1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/nxdomain-for-unknown-record/expected_result b/regression-tests/tests/nxdomain-for-unknown-record/expected_result
index 4fc9cad0daeb4732b4a0bb8ca0745f0d60209f10..f455c020d8d1aff9fa5e58a5e1e35312fb654c97 100644 (file)
--- a/regression-tests/tests/nxdomain-for-unknown-record/expected_result
+++ b/regression-tests/tests/nxdomain-for-unknown-record/expected_result
@@ -1,3 +1,3 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='no-such-host.example.com.', qtype=A

diff --git a/regression-tests/tests/obscured-wildcard/expected_result b/regression-tests/tests/obscured-wildcard/expected_result
index 8ed83f1e01bdec6744ca05286a214c449e62dd17..dcde87cd9cbdaa02eafb746df52aa3f256f2e572 100644 (file)
--- a/regression-tests/tests/obscured-wildcard/expected_result
+++ b/regression-tests/tests/obscured-wildcard/expected_result
@@ -1,3 +1,3 @@
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.a.something.wtest.com.', qtype=A

diff --git a/regression-tests/tests/one-step-cname-resolution/expected_result b/regression-tests/tests/one-step-cname-resolution/expected_result
index e519f7412d68c231daea26abe3ce060f7ad15be1..2a15399fa33303de119b04bbb7728da1bd59d4b5 100644 (file)
--- a/regression-tests/tests/one-step-cname-resolution/expected_result
+++ b/regression-tests/tests/one-step-cname-resolution/expected_result
@@ -1,4 +1,4 @@
-0      outpost.example.com.    IN      A       120     192.168.2.1
-0      www.example.com.        IN      CNAME   120     outpost.example.com.
+0      outpost.example.com.    120     IN      A       192.168.2.1
+0      www.example.com.        120     IN      CNAME   outpost.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.example.com.', qtype=A

diff --git a/regression-tests/tests/out-of-bailiwick-referral/expected_result b/regression-tests/tests/out-of-bailiwick-referral/expected_result
index e74303b54856318768ff1a6c1801897cd09752be..717c59078b7d9f5c4cad8d01d88c09187c51e593 100644 (file)
--- a/regression-tests/tests/out-of-bailiwick-referral/expected_result
+++ b/regression-tests/tests/out-of-bailiwick-referral/expected_result
@@ -1,4 +1,4 @@
-1      france.example.com.     IN      NS      120     ns1.otherprovider.net.
-1      france.example.com.     IN      NS      120     ns2.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns1.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns2.otherprovider.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.france.example.com.', qtype=A

diff --git a/regression-tests/tests/pretty-big-packet/expected_result b/regression-tests/tests/pretty-big-packet/expected_result
index c564d86288617a044e8f21e99a9fb9097bd0262c..48b51570629cb9820c1b446fd57165225774a2a4 100644 (file)
--- a/regression-tests/tests/pretty-big-packet/expected_result
+++ b/regression-tests/tests/pretty-big-packet/expected_result
@@ -1,27 +1,27 @@
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.1
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.10
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.11
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.12
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.13
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.14
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.15
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.16
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.17
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.18
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.19
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.2
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.20
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.21
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.22
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.23
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.24
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.25
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.3
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.4
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.5
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.6
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.7
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.8
-0      toomuchinfo-a.example.com.      IN      A       120     192.168.99.9
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.1
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.10
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.11
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.12
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.13
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.14
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.15
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.16
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.17
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.18
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.19
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.2
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.20
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.21
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.22
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.23
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.24
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.25
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.3
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.4
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.5
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.6
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.7
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.8
+0      toomuchinfo-a.example.com.      120     IN      A       192.168.99.9
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='toomuchinfo-a.example.com.', qtype=A

diff --git a/regression-tests/tests/publishing-cds-cdnskey/expected_result b/regression-tests/tests/publishing-cds-cdnskey/expected_result
index 42d41acf2512f7547221b8e9d609a27afe44a734..505da2cc4ddba505216675ff500145729dddbb66 100644 (file)
--- a/regression-tests/tests/publishing-cds-cdnskey/expected_result
+++ b/regression-tests/tests/publishing-cds-cdnskey/expected_result
@@ -1,46 +1,46 @@
-0      secure-delegated.dnssec-parent.com.     IN      CDS     86400   54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     86400   IN      CDS     54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=CDS
-0      secure-delegated.dnssec-parent.com.     IN      CDNSKEY 86400   257 3 8 AwEAAZd9R7SWWGqA12oG7Ls+h3b0/IAyMj/Pqn/ZuKWM/OdpxT/cn2xwLDhkdmqP/pUqAzvyFPyd4kTqrmLfbohBwA7+07pBVa4qf/jxlHivdMNUD72H+dUYqBlmhCC6l3eG+8FZi2tkdwn8kUoa9kyLMtrEaFnOd/oUQbmNvIDp+8VWv1cSnRJ8UXKdXLl0smpvC7h1K2AUiC5oGIYQTCYWwYRM1wCbb+q1fbFCdkbI7OQW/h7Pj30eLpIuz0bJj4vdKXXZHK8clSdTMAFm6rQsNDI0w7QdCgaDmTn3b6TF2UJi4eDnh7uDbSpUd1mI5XWNw4C6WrUmebFLfiry6vqdiIc=
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     86400   IN      CDNSKEY 257 3 8 AwEAAZd9R7SWWGqA12oG7Ls+h3b0/IAyMj/Pqn/ZuKWM/OdpxT/cn2xwLDhkdmqP/pUqAzvyFPyd4kTqrmLfbohBwA7+07pBVa4qf/jxlHivdMNUD72H+dUYqBlmhCC6l3eG+8FZi2tkdwn8kUoa9kyLMtrEaFnOd/oUQbmNvIDp+8VWv1cSnRJ8UXKdXLl0smpvC7h1K2AUiC5oGIYQTCYWwYRM1wCbb+q1fbFCdkbI7OQW/h7Pj30eLpIuz0bJj4vdKXXZHK8clSdTMAFm6rQsNDI0w7QdCgaDmTn3b6TF2UJi4eDnh7uDbSpUd1mI5XWNw4C6WrUmebFLfiry6vqdiIc=
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=CDNSKEY
-0      secure-delegated.dnssec-parent.com.     IN      CDNSKEY 86400   257 3 8 AwEAAZd9R7SWWGqA12oG7Ls+h3b0/IAyMj/Pqn/ZuKWM/OdpxT/cn2xwLDhkdmqP/pUqAzvyFPyd4kTqrmLfbohBwA7+07pBVa4qf/jxlHivdMNUD72H+dUYqBlmhCC6l3eG+8FZi2tkdwn8kUoa9kyLMtrEaFnOd/oUQbmNvIDp+8VWv1cSnRJ8UXKdXLl0smpvC7h1K2AUiC5oGIYQTCYWwYRM1wCbb+q1fbFCdkbI7OQW/h7Pj30eLpIuz0bJj4vdKXXZHK8clSdTMAFm6rQsNDI0w7QdCgaDmTn3b6TF2UJi4eDnh7uDbSpUd1mI5XWNw4C6WrUmebFLfiry6vqdiIc=
-0      secure-delegated.dnssec-parent.com.     IN      CDS     86400   54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   86400   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-0      dnssec-parent.com.      IN      CDS     86400   0 0 0 00
-0      dnssec-parent.com.      IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     86400   IN      CDNSKEY 257 3 8 AwEAAZd9R7SWWGqA12oG7Ls+h3b0/IAyMj/Pqn/ZuKWM/OdpxT/cn2xwLDhkdmqP/pUqAzvyFPyd4kTqrmLfbohBwA7+07pBVa4qf/jxlHivdMNUD72H+dUYqBlmhCC6l3eG+8FZi2tkdwn8kUoa9kyLMtrEaFnOd/oUQbmNvIDp+8VWv1cSnRJ8UXKdXLl0smpvC7h1K2AUiC5oGIYQTCYWwYRM1wCbb+q1fbFCdkbI7OQW/h7Pj30eLpIuz0bJj4vdKXXZHK8clSdTMAFm6rQsNDI0w7QdCgaDmTn3b6TF2UJi4eDnh7uDbSpUd1mI5XWNw4C6WrUmebFLfiry6vqdiIc=
+0      secure-delegated.dnssec-parent.com.     86400   IN      CDS     54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDNSKEY 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      secure-delegated.dnssec-parent.com.     86400   IN      RRSIG   CDS 8 3 86400 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+0      dnssec-parent.com.      86400   IN      CDS     0 0 0 00
+0      dnssec-parent.com.      86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dnssec-parent.com.', qtype=CDS
-0      dnssec-parent.com.      IN      CDNSKEY 86400   0 3 0 AA==
-0      dnssec-parent.com.      IN      RRSIG   86400   CDNSKEY 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      dnssec-parent.com.      86400   IN      CDNSKEY 0 3 0 AA==
+0      dnssec-parent.com.      86400   IN      RRSIG   CDNSKEY 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='dnssec-parent.com.', qtype=CDNSKEY
-0      dnssec-parent.com.      IN      CDNSKEY 86400   0 3 0 AA==
-0      dnssec-parent.com.      IN      CDS     86400   0 0 0 00
-0      dnssec-parent.com.      IN      RRSIG   86400   CDNSKEY 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
-0      dnssec-parent.com.      IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
-0      cdnskey-cds-test.com.   IN      CDS     86400
-0      cdnskey-cds-test.com.   IN      RRSIG   86400
-2      .       IN      OPT     32768   
+0      dnssec-parent.com.      86400   IN      CDNSKEY 0 3 0 AA==
+0      dnssec-parent.com.      86400   IN      CDS     0 0 0 00
+0      dnssec-parent.com.      86400   IN      RRSIG   CDNSKEY 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+0      dnssec-parent.com.      86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+0      cdnskey-cds-test.com.   86400
+0      cdnskey-cds-test.com.   86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cdnskey-cds-test.com.', qtype=CDS
-0      cdnskey-cds-test.com.   IN      CDNSKEY 86400
-0      cdnskey-cds-test.com.   IN      RRSIG   86400
-2      .       IN      OPT     32768   
+0      cdnskey-cds-test.com.   86400
+0      cdnskey-cds-test.com.   86400
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cdnskey-cds-test.com.', qtype=CDNSKEY
-0      cdnskey-cds-test.com.   IN      CDNSKEY 86400
-0      cdnskey-cds-test.com.   IN      CDS     86400
-0      cdnskey-cds-test.com.   IN      RRSIG   86400
-0      cdnskey-cds-test.com.   IN      RRSIG   86400
+0      cdnskey-cds-test.com.   86400
+0      cdnskey-cds-test.com.   86400
+0      cdnskey-cds-test.com.   86400
+0      cdnskey-cds-test.com.   86400

diff --git a/regression-tests/tests/root-cname/expected_result b/regression-tests/tests/root-cname/expected_result
index bb40a96c4a7ab6a21b9849c0801e3bf8fe4f815f..a919844e548383c724dcd77dafcc861e60a5e0b8 100644 (file)
--- a/regression-tests/tests/root-cname/expected_result
+++ b/regression-tests/tests/root-cname/expected_result
@@ -1,3 +1,3 @@
-0      toroot.test.com.        IN      CNAME   3600    .
+0      toroot.test.com.        3600    IN      CNAME   .
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='toroot.test.com.', qtype=CNAME

diff --git a/regression-tests/tests/root-mx/expected_result b/regression-tests/tests/root-mx/expected_result
index f4ba5e02096dd3d8dfba46cd83d7051a930909d2..a2ef229a559cb24d97de8a1eca84f3242e14773c 100644 (file)
--- a/regression-tests/tests/root-mx/expected_result
+++ b/regression-tests/tests/root-mx/expected_result
@@ -1,4 +1,4 @@
-0      test.com.       IN      MX      3600    10 .
-0      test.com.       IN      MX      3600    15 smtp-servers.test.com.
+0      test.com.       3600    IN      MX      10 .
+0      test.com.       3600    IN      MX      15 smtp-servers.test.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.com.', qtype=MX

diff --git a/regression-tests/tests/root-ns/expected_result b/regression-tests/tests/root-ns/expected_result
index 33ce7aa1d8e6e18d97b4ab6835583dff73910b0d..757f05409cc4520bbbbb053b3b68506937bf7467 100644 (file)
--- a/regression-tests/tests/root-ns/expected_result
+++ b/regression-tests/tests/root-ns/expected_result
@@ -1,5 +1,5 @@
-0      wtest.com.      IN      NS      3600    .
-0      wtest.com.      IN      NS      3600    ns1.wtest.com.
-2      ns1.wtest.com.  IN      A       3600    2.3.4.5
+0      wtest.com.      3600    IN      NS      .
+0      wtest.com.      3600    IN      NS      ns1.wtest.com.
+2      ns1.wtest.com.  3600    IN      A       2.3.4.5
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='wtest.com.', qtype=NS

diff --git a/regression-tests/tests/root-srv/expected_result b/regression-tests/tests/root-srv/expected_result
index a987c0db66a46d0fc03c03ed6ea93fe4d5aec728..3cd7ee63c891f01791c56ea6a26570bd39b91e73 100644 (file)
--- a/regression-tests/tests/root-srv/expected_result
+++ b/regression-tests/tests/root-srv/expected_result
@@ -1,3 +1,3 @@
-0      _root._tcp.dc.test.com. IN      SRV     3600    0 0 0 .
+0      _root._tcp.dc.test.com. 3600    IN      SRV     0 0 0 .
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='_root._tcp.dc.test.com.', qtype=SRV

diff --git a/regression-tests/tests/rp/expected_result b/regression-tests/tests/rp/expected_result
index 32acf173bfcee864a03aa8965e80ec129f3c7084..d8633b912975dde8edf358636f6d852c7f609aa6 100644 (file)
--- a/regression-tests/tests/rp/expected_result
+++ b/regression-tests/tests/rp/expected_result
@@ -1,3 +1,3 @@
-0      server1.test.com.       IN      RP      3600    ahu.ds9a.nl. counter.test.com.
+0      server1.test.com.       3600    IN      RP      ahu.ds9a.nl. counter.test.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='server1.test.com.', qtype=RP

diff --git a/regression-tests/tests/same-level-referral-soa/expected_result b/regression-tests/tests/same-level-referral-soa/expected_result
index 7fcadae9695f453fa7e1573cfab1e2941f42ad4c..6ca3b1e1b6a99d6c894292a912d7332fc7722186 100644 (file)
--- a/regression-tests/tests/same-level-referral-soa/expected_result
+++ b/regression-tests/tests/same-level-referral-soa/expected_result
@@ -1,4 +1,4 @@
-1      france.example.com.     IN      NS      120     ns1.otherprovider.net.
-1      france.example.com.     IN      NS      120     ns2.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns1.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns2.otherprovider.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='france.example.com.', qtype=SOA

diff --git a/regression-tests/tests/same-level-referral/expected_result b/regression-tests/tests/same-level-referral/expected_result
index 7780e348f583e55d4033c8df5d81a0e872de137e..6dcfddd7d67fded1f1f268240e487eaad9c36a02 100644 (file)
--- a/regression-tests/tests/same-level-referral/expected_result
+++ b/regression-tests/tests/same-level-referral/expected_result
@@ -1,4 +1,4 @@
-1      france.example.com.     IN      NS      120     ns1.otherprovider.net.
-1      france.example.com.     IN      NS      120     ns2.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns1.otherprovider.net.
+1      france.example.com.     120     IN      NS      ns2.otherprovider.net.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='france.example.com.', qtype=A

diff --git a/regression-tests/tests/second-level-nxdomain/expected_result b/regression-tests/tests/second-level-nxdomain/expected_result
index a6c944ad67d0a54595bb9ae04f8e1d9bfcef228f..55c72bdbe56359ac8ee7e6e38ef6dcd8a6462896 100644 (file)
--- a/regression-tests/tests/second-level-nxdomain/expected_result
+++ b/regression-tests/tests/second-level-nxdomain/expected_result
@@ -1,7 +1,7 @@
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      outpost.example.com.    IN      NSEC    86400   rhs-at-expansion.example.com. A RRSIG NSEC
-1      outpost.example.com.    IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      outpost.example.com.    86400   IN      NSEC    rhs-at-expansion.example.com. A RRSIG NSEC
+1      outpost.example.com.    86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/second-level-nxdomain/expected_result.narrow b/regression-tests/tests/second-level-nxdomain/expected_result.narrow
index 9f53f6b4d56f41d99b81add5fec93306df566506..618224b572b7782c2948edd4a5a2dcb758f20325 100644 (file)
--- a/regression-tests/tests/second-level-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/second-level-nxdomain/expected_result.narrow
@@ -1,11 +1,11 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      k6ta8mhi455hk3jskn0b2st81j6fa1l0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd K6TA8MHI455HK3JSKN0B2ST81J6FA1L2
-1      k6ta8mhi455hk3jskn0b2st81j6fa1l0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd TSDP8HAJLFGR90CV4IB634G1M25NC5UR
-1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5UVGFM2VJCJE09SVS7LFB22I1UUQJF99 A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      k6ta8mhi455hk3jskn0b2st81j6fa1l0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd K6TA8MHI455HK3JSKN0B2ST81J6FA1L2
+1      k6ta8mhi455hk3jskn0b2st81j6fa1l0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd TSDP8HAJLFGR90CV4IB634G1M25NC5UR
+1      tsdp8hajlfgr90cv4ib634g1m25nc5up.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/second-level-nxdomain/expected_result.nsec3 b/regression-tests/tests/second-level-nxdomain/expected_result.nsec3
index 27b3c08a5ebfe1dbaa264c5d543a0a8dc2743947..02755b08c5cb8cdabc617d0450ad79ba2b8e1880 100644 (file)
--- a/regression-tests/tests/second-level-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/second-level-nxdomain/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
-1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      k6r6482mfo4upme9n407c2grb6opp1ip.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd K6TDMVV7BP54FEFUIVR0BVABIBUN0AV9 A RRSIG
-1      k6r6482mfo4upme9n407c2grb6opp1ip.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd TSIKPRKTT53V9ILUK08SMR9KADQ44TR1 A RRSIG
-1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      k6r6482mfo4upme9n407c2grb6opp1ip.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd K6TDMVV7BP54FEFUIVR0BVABIBUN0AV9 A RRSIG
+1      k6r6482mfo4upme9n407c2grb6opp1ip.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd TSIKPRKTT53V9ILUK08SMR9KADQ44TR1 A RRSIG
+1      tsbl3ev9tces1kjgto3qtn36ltlu0te1.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx.outpost.example.com.', qtype=A

diff --git a/regression-tests/tests/secure-cname-to-insecure-child/expected_result b/regression-tests/tests/secure-cname-to-insecure-child/expected_result
index 288e33ba1802827c87dfa9df379d618fad9c7ca8..d98397052f9935ea04e8c3075ed22c4876014e63 100644 (file)
--- a/regression-tests/tests/secure-cname-to-insecure-child/expected_result
+++ b/regression-tests/tests/secure-cname-to-insecure-child/expected_result
@@ -1,5 +1,5 @@
-0      www.dnssec-parent.com.  IN      CNAME   3600    www.insecure.dnssec-parent.com.
-0      www.insecure.dnssec-parent.com. IN      A       120     192.0.2.88
-2      .       IN      OPT     32768   
+0      www.dnssec-parent.com.  3600    IN      CNAME   www.insecure.dnssec-parent.com.
+0      www.insecure.dnssec-parent.com. 120     IN      A       192.0.2.88
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/secure-cname-to-insecure-child/expected_result.dnssec b/regression-tests/tests/secure-cname-to-insecure-child/expected_result.dnssec
index 937f3a3c006b9b5a6df2d5c2c24260e3dcf9c987..49117e9a81b49cd5896ff629181ae56da4bb3331 100644 (file)
--- a/regression-tests/tests/secure-cname-to-insecure-child/expected_result.dnssec
+++ b/regression-tests/tests/secure-cname-to-insecure-child/expected_result.dnssec
@@ -1,6 +1,6 @@
-0      www.dnssec-parent.com.  IN      CNAME   3600    www.insecure.dnssec-parent.com.
-0      www.dnssec-parent.com.  IN      RRSIG   3600    CNAME 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
-0      www.insecure.dnssec-parent.com. IN      A       120     192.0.2.88
-2      .       IN      OPT     32768   
+0      www.dnssec-parent.com.  3600    IN      CNAME   www.insecure.dnssec-parent.com.
+0      www.dnssec-parent.com.  3600    IN      RRSIG   CNAME 13 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+0      www.insecure.dnssec-parent.com. 120     IN      A       192.0.2.88
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/secure-cname-to-insecure/expected_result b/regression-tests/tests/secure-cname-to-insecure/expected_result
index 7bcd930365e4412c027d27767359e47b72fc66a3..59a86214bb9d993d3814cf88c1ad7f7af2c537db 100644 (file)
--- a/regression-tests/tests/secure-cname-to-insecure/expected_result
+++ b/regression-tests/tests/secure-cname-to-insecure/expected_result
@@ -1,5 +1,5 @@
-0      cname-to-insecure.example.com.  IN      CNAME   120     www.insecure.dnssec-parent.com.
-0      www.insecure.dnssec-parent.com. IN      A       120     192.0.2.88
-2      .       IN      OPT     32768   
+0      cname-to-insecure.example.com.  120     IN      CNAME   www.insecure.dnssec-parent.com.
+0      www.insecure.dnssec-parent.com. 120     IN      A       192.0.2.88
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-to-insecure.example.com.', qtype=A

diff --git a/regression-tests/tests/secure-cname-to-insecure/expected_result.dnssec b/regression-tests/tests/secure-cname-to-insecure/expected_result.dnssec
index 76458ceacbfc81e0ce13960243fdd94ec3d16389..c4835f71b590cbb279247afc671c6dd459a79285 100644 (file)
--- a/regression-tests/tests/secure-cname-to-insecure/expected_result.dnssec
+++ b/regression-tests/tests/secure-cname-to-insecure/expected_result.dnssec
@@ -1,6 +1,6 @@
-0      cname-to-insecure.example.com.  IN      CNAME   120     www.insecure.dnssec-parent.com.
-0      cname-to-insecure.example.com.  IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-0      www.insecure.dnssec-parent.com. IN      A       120     192.0.2.88
-2      .       IN      OPT     32768   
+0      cname-to-insecure.example.com.  120     IN      CNAME   www.insecure.dnssec-parent.com.
+0      cname-to-insecure.example.com.  120     IN      RRSIG   CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
+0      www.insecure.dnssec-parent.com. 120     IN      A       192.0.2.88
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-to-insecure.example.com.', qtype=A

diff --git a/regression-tests/tests/secure-delegation-ds-ns/expected_result b/regression-tests/tests/secure-delegation-ds-ns/expected_result
index ddfa55f2fdc92590dcd4b1f3de1fe53da8e39d54..86431972a29cba3775ed998dcb9e200fe5005fc1 100644 (file)
--- a/regression-tests/tests/secure-delegation-ds-ns/expected_result
+++ b/regression-tests/tests/secure-delegation-ds-ns/expected_result
@@ -1,4 +1,4 @@
-1      dsdelegation.example.com.       IN      NS      120     ns.example.com.
-2      .       IN      OPT     32768   
+1      dsdelegation.example.com.       120     IN      NS      ns.example.com.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.dsdelegation.example.com.', qtype=A

diff --git a/regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec b/regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec
index 47f190b99e1d80b3160ad45f83c37c0ce64d5f3a..f692fa3e693f361b25300056b389e533d40dc9c2 100644 (file)
--- a/regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec
+++ b/regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec
@@ -1,6 +1,6 @@
-1      dsdelegation.example.com.       IN      DS      120     28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
-1      dsdelegation.example.com.       IN      NS      120     ns.example.com.
-1      dsdelegation.example.com.       IN      RRSIG   120     DS 13 3 120 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      dsdelegation.example.com.       120     IN      DS      28129 8 1 caf1eaaecdabe7616670788f9022454bf5fd9fda
+1      dsdelegation.example.com.       120     IN      NS      ns.example.com.
+1      dsdelegation.example.com.       120     IN      RRSIG   DS 13 3 120 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.dsdelegation.example.com.', qtype=A

diff --git a/regression-tests/tests/secure-delegation/expected_result b/regression-tests/tests/secure-delegation/expected_result
index d35c8c6ce3889556931076be4399b5fdd295bbeb..65cfd70cd546dbc0d97a245eda2444b7abc8a751 100644 (file)
--- a/regression-tests/tests/secure-delegation/expected_result
+++ b/regression-tests/tests/secure-delegation/expected_result
@@ -1,4 +1,4 @@
-0      secure-delegated.dnssec-parent.com.     IN      A       3600    9.9.9.9
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     3600    IN      A       9.9.9.9
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/secure-delegation/expected_result.dnssec b/regression-tests/tests/secure-delegation/expected_result.dnssec
index 93840376b7f6712042bfeea9487389301336d2e9..fc53931e46bc01d318cfdc63260a23b674aca82a 100644 (file)
--- a/regression-tests/tests/secure-delegation/expected_result.dnssec
+++ b/regression-tests/tests/secure-delegation/expected_result.dnssec
@@ -1,5 +1,5 @@
-0      secure-delegated.dnssec-parent.com.     IN      A       3600    9.9.9.9
-0      secure-delegated.dnssec-parent.com.     IN      RRSIG   3600    A 8 3 3600 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
-2      .       IN      OPT     32768   
+0      secure-delegated.dnssec-parent.com.     3600    IN      A       9.9.9.9
+0      secure-delegated.dnssec-parent.com.     3600    IN      RRSIG   A 8 3 3600 [expiry] [inception] [keytag] secure-delegated.dnssec-parent.com. ...
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/space-name/expected_result b/regression-tests/tests/space-name/expected_result
index da87b5ffd155c1156c0a1d932648ad8539016a72..c28a9670843cc0850616da2cde0164fbb837c10b 100644 (file)
--- a/regression-tests/tests/space-name/expected_result
+++ b/regression-tests/tests/space-name/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      smtp1.example.com.      IN      NSEC    86400   start.example.com. CNAME RRSIG NSEC
-1      smtp1.example.com.      IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      smtp1.example.com.      86400   IN      NSEC    start.example.com. CNAME RRSIG NSEC
+1      smtp1.example.com.      86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='space\032name.example.com.', qtype=A

diff --git a/regression-tests/tests/space-name/expected_result.narrow b/regression-tests/tests/space-name/expected_result.narrow
index de870e2f3363e8f6aadb299705070db397f7df84..9c8f65c15d5aa1d01ef2c224569232a8a948275e 100644 (file)
--- a/regression-tests/tests/space-name/expected_result.narrow
+++ b/regression-tests/tests/space-name/expected_result.narrow
@@ -1,11 +1,11 @@
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      gl4qf9db2fkivonidgs9954bhkhpvviq.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd GL4QF9DB2FKIVONIDGS9954BHKHPVVIS
-1      gl4qf9db2fkivonidgs9954bhkhpvviq.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      gl4qf9db2fkivonidgs9954bhkhpvviq.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd GL4QF9DB2FKIVONIDGS9954BHKHPVVIS
+1      gl4qf9db2fkivonidgs9954bhkhpvviq.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='space\032name.example.com.', qtype=A

diff --git a/regression-tests/tests/space-name/expected_result.nsec3 b/regression-tests/tests/space-name/expected_result.nsec3
index e899b33cfabf544c8f4603d20e11e362ec8906cb..ee653d3fa5a6a1dbd90df6be38af369a0b985c6d 100644 (file)
--- a/regression-tests/tests/space-name/expected_result.nsec3
+++ b/regression-tests/tests/space-name/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      gl3vilecelbsri6t44urj9lp6m5853mq.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd GL5I9VH027O95O1M3UTE1A8KR1TJ253D A RRSIG
-1      gl3vilecelbsri6t44urj9lp6m5853mq.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      gl3vilecelbsri6t44urj9lp6m5853mq.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd GL5I9VH027O95O1M3UTE1A8KR1TJ253D A RRSIG
+1      gl3vilecelbsri6t44urj9lp6m5853mq.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='space\032name.example.com.', qtype=A

diff --git a/regression-tests/tests/svcb-aliasmode/expected_result b/regression-tests/tests/svcb-aliasmode/expected_result
index 145d33364c1a178a615ebfcc25a5e0d7dcc2e49a..2ec88ae8fd1507cde9cdcbf55347391ce05248dc 100644 (file)
--- a/regression-tests/tests/svcb-aliasmode/expected_result
+++ b/regression-tests/tests/svcb-aliasmode/expected_result
@@ -1,10 +1,10 @@
-0      foo.svcb.example.com.   IN      SVCB    120     0 foo1.svcb.example.com.
-2      .       IN      OPT     32768   
-2      foo1.svcb.example.com.  IN      A       120     192.0.2.2
-2      foo1.svcb.example.com.  IN      SVCB    120     1 . alpn=h2,h3
+0      foo.svcb.example.com.   120     IN      SVCB    0 foo1.svcb.example.com.
+2      .       32768   IN      OPT     
+2      foo1.svcb.example.com.  120     IN      A       192.0.2.2
+2      foo1.svcb.example.com.  120     IN      SVCB    1 . alpn=h2,h3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='foo.svcb.example.com.', qtype=SVCB
-0      baz.svcb.example.com.   IN      SVCB    120     0 foo1.svcb.example.net.
-2      .       IN      OPT     32768   
+0      baz.svcb.example.com.   120     IN      SVCB    0 foo1.svcb.example.net.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='baz.svcb.example.com.', qtype=SVCB

diff --git a/regression-tests/tests/svcb-aliasmode/expected_result.dnssec b/regression-tests/tests/svcb-aliasmode/expected_result.dnssec
index 64f1189e0ce4bd698ae4ee9a18491ef015dcc3de..2c7f67a6288d33fa220e8819325a0c2b195dfa47 100644 (file)
--- a/regression-tests/tests/svcb-aliasmode/expected_result.dnssec
+++ b/regression-tests/tests/svcb-aliasmode/expected_result.dnssec
@@ -1,14 +1,14 @@
-0      foo.svcb.example.com.   IN      RRSIG   120     SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
-0      foo.svcb.example.com.   IN      SVCB    120     0 foo1.svcb.example.com.
-2      .       IN      OPT     32768   
-2      foo1.svcb.example.com.  IN      A       120     192.0.2.2
-2      foo1.svcb.example.com.  IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] example.com. ...
-2      foo1.svcb.example.com.  IN      RRSIG   120     SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
-2      foo1.svcb.example.com.  IN      SVCB    120     1 . alpn=h2,h3
+0      foo.svcb.example.com.   120     IN      RRSIG   SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
+0      foo.svcb.example.com.   120     IN      SVCB    0 foo1.svcb.example.com.
+2      .       32768   IN      OPT     
+2      foo1.svcb.example.com.  120     IN      A       192.0.2.2
+2      foo1.svcb.example.com.  120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] example.com. ...
+2      foo1.svcb.example.com.  120     IN      RRSIG   SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
+2      foo1.svcb.example.com.  120     IN      SVCB    1 . alpn=h2,h3
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='foo.svcb.example.com.', qtype=SVCB
-0      baz.svcb.example.com.   IN      RRSIG   120     SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
-0      baz.svcb.example.com.   IN      SVCB    120     0 foo1.svcb.example.net.
-2      .       IN      OPT     32768   
+0      baz.svcb.example.com.   120     IN      RRSIG   SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
+0      baz.svcb.example.com.   120     IN      SVCB    0 foo1.svcb.example.net.
+2      .       32768   IN      OPT     
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='baz.svcb.example.com.', qtype=SVCB

diff --git a/regression-tests/tests/svcb-servicemode/expected_result b/regression-tests/tests/svcb-servicemode/expected_result
index b8f811b39e04aa7b207cece199d13ed2552c67c3..c4a8c4303a4115a2a92161f7d067578400c9a8e3 100644 (file)
--- a/regression-tests/tests/svcb-servicemode/expected_result
+++ b/regression-tests/tests/svcb-servicemode/expected_result
@@ -1,8 +1,8 @@
-0      bar.svcb.example.com.   IN      SVCB    120     1 . alpn=h2
-0      bar.svcb.example.com.   IN      SVCB    120     3 . alpn=h3 port=1500
-2      .       IN      OPT     32768   
-2      bar.svcb.example.com.   IN      A       120     192.0.2.1
-2      bar.svcb.example.com.   IN      AAAA    120     2001:db8::3:1
-2      bar.svcb.example.com.   IN      AAAA    120     2001:db8::3:4
+0      bar.svcb.example.com.   120     IN      SVCB    1 . alpn=h2
+0      bar.svcb.example.com.   120     IN      SVCB    3 . alpn=h3 port=1500
+2      .       32768   IN      OPT     
+2      bar.svcb.example.com.   120     IN      A       192.0.2.1
+2      bar.svcb.example.com.   120     IN      AAAA    2001:db8::3:1
+2      bar.svcb.example.com.   120     IN      AAAA    2001:db8::3:4
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='bar.svcb.example.com.', qtype=SVCB

diff --git a/regression-tests/tests/svcb-servicemode/expected_result.dnssec b/regression-tests/tests/svcb-servicemode/expected_result.dnssec
index 3faec47c51828eb7b181109df408f5af1687fbb2..7920485fa5ec3929d68357eff95104f8e07315b9 100644 (file)
--- a/regression-tests/tests/svcb-servicemode/expected_result.dnssec
+++ b/regression-tests/tests/svcb-servicemode/expected_result.dnssec
@@ -1,11 +1,11 @@
-0      bar.svcb.example.com.   IN      RRSIG   120     SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
-0      bar.svcb.example.com.   IN      SVCB    120     1 . alpn=h2
-0      bar.svcb.example.com.   IN      SVCB    120     3 . alpn=h3 port=1500
-2      .       IN      OPT     32768   
-2      bar.svcb.example.com.   IN      A       120     192.0.2.1
-2      bar.svcb.example.com.   IN      AAAA    120     2001:db8::3:1
-2      bar.svcb.example.com.   IN      AAAA    120     2001:db8::3:4
-2      bar.svcb.example.com.   IN      RRSIG   120     A 13 4 120 [expiry] [inception] [keytag] example.com. ...
-2      bar.svcb.example.com.   IN      RRSIG   120     AAAA 13 4 120 [expiry] [inception] [keytag] example.com. ...
+0      bar.svcb.example.com.   120     IN      RRSIG   SVCB 13 4 120 [expiry] [inception] [keytag] example.com. ...
+0      bar.svcb.example.com.   120     IN      SVCB    1 . alpn=h2
+0      bar.svcb.example.com.   120     IN      SVCB    3 . alpn=h3 port=1500
+2      .       32768   IN      OPT     
+2      bar.svcb.example.com.   120     IN      A       192.0.2.1
+2      bar.svcb.example.com.   120     IN      AAAA    2001:db8::3:1
+2      bar.svcb.example.com.   120     IN      AAAA    2001:db8::3:4
+2      bar.svcb.example.com.   120     IN      RRSIG   A 13 4 120 [expiry] [inception] [keytag] example.com. ...
+2      bar.svcb.example.com.   120     IN      RRSIG   AAAA 13 4 120 [expiry] [inception] [keytag] example.com. ...
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='bar.svcb.example.com.', qtype=SVCB

diff --git a/regression-tests/tests/test-urc/expected_result b/regression-tests/tests/test-urc/expected_result
index 6787668eeba20c2114c71359386582594c3d5355..728deafef450700a0137bec76ff57f049eb9ef10 100644 (file)
--- a/regression-tests/tests/test-urc/expected_result
+++ b/regression-tests/tests/test-urc/expected_result
@@ -1,3 +1,3 @@
-0      urc65226.test.com.      IN      TYPE65226       3600    \# 3 414243
+0      urc65226.test.com.      3600    IN      TYPE65226       \# 3 414243
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='urc65226.test.com.', qtype=TYPE65226

diff --git a/regression-tests/tests/two-level-nxdomain/expected_result b/regression-tests/tests/two-level-nxdomain/expected_result
index d8d21b05572e4cc79e6222144b1c434a1440a95b..f5bf604f7713e9c5288e969647322b5b321660a3 100644 (file)
--- a/regression-tests/tests/two-level-nxdomain/expected_result
+++ b/regression-tests/tests/two-level-nxdomain/expected_result
@@ -1,9 +1,9 @@
-1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
-1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      ns2.example.com.        IN      NSEC    86400   nxd.example.com. A RRSIG NSEC
-1      ns2.example.com.        IN      RRSIG   86400   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      example.com.    86400   IN      NSEC    _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    86400   IN      RRSIG   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      ns2.example.com.        86400   IN      NSEC    nxd.example.com. A RRSIG NSEC
+1      ns2.example.com.        86400   IN      RRSIG   NSEC 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.example.com.', qtype=A

diff --git a/regression-tests/tests/two-level-nxdomain/expected_result.narrow b/regression-tests/tests/two-level-nxdomain/expected_result.narrow
index 315280afa5b1004597324542f0255078495c98c4..3d59f3c1abe8190e17a2f84a776a2ff7374566df 100644 (file)
--- a/regression-tests/tests/two-level-nxdomain/expected_result.narrow
+++ b/regression-tests/tests/two-level-nxdomain/expected_result.narrow
@@ -1,11 +1,11 @@
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
-1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      ectnliqstqsjnnrpuhjj5h0j3c3odkk3.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ECTNLIQSTQSJNNRPUHJJ5H0J3C3ODKK5
-1      ectnliqstqsjnnrpuhjj5h0j3c3odkk3.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FAG9508OQU3M22QAC0U5EQGG45V8CF2
+1      9fag9508oqu3m22qac0u5eqgg45v8cf0.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      ectnliqstqsjnnrpuhjj5h0j3c3odkk3.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ECTNLIQSTQSJNNRPUHJJ5H0J3C3ODKK5
+1      ectnliqstqsjnnrpuhjj5h0j3c3odkk3.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.example.com.', qtype=A

diff --git a/regression-tests/tests/two-level-nxdomain/expected_result.nsec3 b/regression-tests/tests/two-level-nxdomain/expected_result.nsec3
index ad2307d11287c2a972600c1b6355eb047c27f968..1f38c6f2bb646ed0d5e1992a24f7fc3759246d53 100644 (file)
--- a/regression-tests/tests/two-level-nxdomain/expected_result.nsec3
+++ b/regression-tests/tests/two-level-nxdomain/expected_result.nsec3
@@ -1,11 +1,11 @@
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
-1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      ecskkg9s6f7lap5qjrnns1bf8pjunshj.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd ECTPI4N8UNDE9GNVKHG28NJR512JBD4O A RRSIG
-1      ecskkg9s6f7lap5qjrnns1bf8pjunshj.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
-2      .       IN      OPT     32768   
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      ecskkg9s6f7lap5qjrnns1bf8pjunshj.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd ECTPI4N8UNDE9GNVKHG28NJR512JBD4O A RRSIG
+1      ecskkg9s6f7lap5qjrnns1bf8pjunshj.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      RRSIG   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      NSEC3   1 [flags] 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   86400   IN      RRSIG   NSEC3 13 3 86400 [expiry] [inception] [keytag] example.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='nx1.nx2.example.com.', qtype=A

diff --git a/regression-tests/tests/type65535-query/expected_result b/regression-tests/tests/type65535-query/expected_result
index 39db1b923ffceedb893aa3f0fa7b870541906853..1c4f937acb75c2d2402da71520f0e84b881bb0cd 100644 (file)
--- a/regression-tests/tests/type65535-query/expected_result
+++ b/regression-tests/tests/type65535-query/expected_result
@@ -1,3 +1,3 @@
-1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+1      example.com.    86400   IN      SOA     ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=TYPE65535

diff --git a/regression-tests/tests/underscore-sorting/expected_result b/regression-tests/tests/underscore-sorting/expected_result
index 4464fafc739df8ee543c38c5204f3040b1e40516..b5d1f08bb803d37902ff1950604b898db1d3a84b 100644 (file)
--- a/regression-tests/tests/underscore-sorting/expected_result
+++ b/regression-tests/tests/underscore-sorting/expected_result
@@ -1,2 +1,2 @@
-1      test.com.       IN      NSEC    3600    _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
-1      www.test.com.   IN      NSEC    3600    test.com. CNAME RRSIG NSEC
+1      test.com.       3600    IN      NSEC    _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
+1      www.test.com.   3600    IN      NSEC    test.com. CNAME RRSIG NSEC

diff --git a/regression-tests/tests/underscore-sorting/expected_result.narrow b/regression-tests/tests/underscore-sorting/expected_result.narrow
index 49323995e15a58935e6fbfc4474f3a9f15ab2b76..c679e01e4615c05ad9e285c9c5bf4cdb7c99100a 100644 (file)
--- a/regression-tests/tests/underscore-sorting/expected_result.narrow
+++ b/regression-tests/tests/underscore-sorting/expected_result.narrow
@@ -1,3 +1,3 @@
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      npce7etkesd3umcst08psfape1cnno5o.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd NPCE7ETKESD3UMCST08PSFAPE1CNNO5Q
-1      nqf0papl2qmp38upr87f930kmebc0o0n.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd NQF0PAPL2QMP38UPR87F930KMEBC0O0P
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      npce7etkesd3umcst08psfape1cnno5o.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd NPCE7ETKESD3UMCST08PSFAPE1CNNO5Q
+1      nqf0papl2qmp38upr87f930kmebc0o0n.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd NQF0PAPL2QMP38UPR87F930KMEBC0O0P

diff --git a/regression-tests/tests/underscore-sorting/expected_result.nsec3 b/regression-tests/tests/underscore-sorting/expected_result.nsec3
index 09be2c04a23903917fc474f46df3ae524a573bfd..6a69976b301668eb01fd4ab49ac4ba9ffd2175aa 100644 (file)
--- a/regression-tests/tests/underscore-sorting/expected_result.nsec3
+++ b/regression-tests/tests/underscore-sorting/expected_result.nsec3
@@ -1,2 +1,2 @@
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      n5rskfsbg0uk5sspj595r6546hkk5vk1.test.com.      IN      NSEC3   3600    1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.test.com.      3600    IN      NSEC3   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG

diff --git a/regression-tests/tests/uppercase-nsec/expected_result b/regression-tests/tests/uppercase-nsec/expected_result
index 72553dc70daa7ed267654f62bd0b14f7af3459cf..566c3491b671e3617ba4f2f50aecc57590ded6e8 100644 (file)
--- a/regression-tests/tests/uppercase-nsec/expected_result
+++ b/regression-tests/tests/uppercase-nsec/expected_result
@@ -1,9 +1,9 @@
-1      Test.com.       IN      NSEC    3600    _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
-1      Test.com.       IN      RRSIG   3600    NSEC 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      SOA     3600    ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      www.Test.com.   IN      NSEC    3600    test.com. CNAME RRSIG NSEC
-1      www.Test.com.   IN      RRSIG   3600    NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+1      Test.com.       3600    IN      NSEC    _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
+1      Test.com.       3600    IN      RRSIG   NSEC 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      SOA     ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      www.Test.com.   3600    IN      NSEC    test.com. CNAME RRSIG NSEC
+1      www.Test.com.   3600    IN      RRSIG   NSEC 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='z.Test.com.', qtype=A

diff --git a/regression-tests/tests/uppercase-nsec/expected_result.narrow b/regression-tests/tests/uppercase-nsec/expected_result.narrow
index 02b01302fa014bdbae004c8d0a1935f2d263a010..f840aa8c081e6517476d6d8c0ef7d4c7dc592e9a 100644 (file)
--- a/regression-tests/tests/uppercase-nsec/expected_result.narrow
+++ b/regression-tests/tests/uppercase-nsec/expected_result.narrow
@@ -1,11 +1,11 @@
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      IN      NSEC3   3600    1 [flags] 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      SOA     3600    ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      npce7etkesd3umcst08psfape1cnno5o.Test.com.      IN      NSEC3   3600    1 [flags] 1 abcd NPCE7ETKESD3UMCST08PSFAPE1CNNO5Q
-1      npce7etkesd3umcst08psfape1cnno5o.Test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      nqf0papl2qmp38upr87f930kmebc0o0n.Test.com.      IN      NSEC3   3600    1 [flags] 1 abcd NQF0PAPL2QMP38UPR87F930KMEBC0O0P
-1      nqf0papl2qmp38upr87f930kmebc0o0n.Test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      3600    IN      NSEC3   1 [flags] 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      SOA     ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      npce7etkesd3umcst08psfape1cnno5o.Test.com.      3600    IN      NSEC3   1 [flags] 1 abcd NPCE7ETKESD3UMCST08PSFAPE1CNNO5Q
+1      npce7etkesd3umcst08psfape1cnno5o.Test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      nqf0papl2qmp38upr87f930kmebc0o0n.Test.com.      3600    IN      NSEC3   1 [flags] 1 abcd NQF0PAPL2QMP38UPR87F930KMEBC0O0P
+1      nqf0papl2qmp38upr87f930kmebc0o0n.Test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='z.Test.com.', qtype=A

diff --git a/regression-tests/tests/uppercase-nsec/expected_result.nsec3 b/regression-tests/tests/uppercase-nsec/expected_result.nsec3
index 3f5797159dde807d35a04126cc382efc284c5bdb..6aa189ddd7175734bb811bef3e9cfe7ceaa6b594 100644 (file)
--- a/regression-tests/tests/uppercase-nsec/expected_result.nsec3
+++ b/regression-tests/tests/uppercase-nsec/expected_result.nsec3
@@ -1,9 +1,9 @@
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      IN      NSEC3   3600    1 [flags] 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      RRSIG   3600    SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
-1      Test.com.       IN      SOA     3600    ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      IN      NSEC3   3600    1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
-1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      IN      RRSIG   3600    NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
-2      .       IN      OPT     32768   
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      3600    IN      NSEC3   1 [flags] 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
+1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      RRSIG   SOA 13 2 3600 [expiry] [inception] [keytag] test.com. ...
+1      Test.com.       3600    IN      SOA     ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      3600    IN      NSEC3   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      3600    IN      RRSIG   NSEC3 13 3 3600 [expiry] [inception] [keytag] test.com. ...
+2      .       32768   IN      OPT     
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='z.Test.com.', qtype=A

diff --git a/regression-tests/tests/very-long-txt/expected_result b/regression-tests/tests/very-long-txt/expected_result
index 383bfbbf9ae83cb085ec26276fd3c8a07d920841..33a4c7b587ef3fe4a8da6f587284b78148e6cb09 100644 (file)
--- a/regression-tests/tests/very-long-txt/expected_result
+++ b/regression-tests/tests/very-long-txt/expected_result
@@ -1,3 +1,3 @@
-0      very-long-txt.test.com. IN      TXT     3600    "A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you" " won't believe how long!"
+0      very-long-txt.test.com. 3600    IN      TXT     "A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you" " won't believe how long!"
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='very-long-txt.test.com.', qtype=TXT

diff --git a/regression-tests/tests/wildcard-overlaps-delegation/expected_result b/regression-tests/tests/wildcard-overlaps-delegation/expected_result
index e8041cc48587188445d6ca4df7c7be7fafb97142..4ce4a88fc6b66f7af4aad34d9aad09b4fb50a162 100644 (file)
--- a/regression-tests/tests/wildcard-overlaps-delegation/expected_result
+++ b/regression-tests/tests/wildcard-overlaps-delegation/expected_result
@@ -1,3 +1,3 @@
-1      sub.test.test.com.      IN      NS      3600    ns-test.example.net.test.com.
+1      sub.test.test.com.      3600    IN      NS      ns-test.example.net.test.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='www.sub.test.test.com.', qtype=A

diff --git a/regression-tests/tests/wrong-type-wildcard/expected_result b/regression-tests/tests/wrong-type-wildcard/expected_result
index 6622ad913ac3f200c7c15a840feb613a730aaec3..221da07c90d8998edaef97438c30a5db52650aae 100644 (file)
--- a/regression-tests/tests/wrong-type-wildcard/expected_result
+++ b/regression-tests/tests/wrong-type-wildcard/expected_result
@@ -1,3 +1,3 @@
-1      wtest.com.      IN      SOA     3600    ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
+1      wtest.com.      3600    IN      SOA     ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.something.wtest.com.', qtype=TXT