reduce the use of cleandig in dyndns tests

diff --git a/regression-tests/1dyndns-update-deep-add-delete/command b/regression-tests/1dyndns-update-deep-add-delete/command
index 73f786352fba783dafc9b684a0e414d8a945491f..4fcb5f4e5c46fa842f3ed334a34b1169d7fbc50f 100755 (executable)
--- a/regression-tests/1dyndns-update-deep-add-delete/command
+++ b/regression-tests/1dyndns-update-deep-add-delete/command
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-cleandig a.b.c.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig a.b.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig x.d.e.f.test.dyndns A hidesoadetails dnssec
-
 mysqldiff
 
 cleannsupdate <<!
@@ -15,9 +11,6 @@ send
 answer
 !
 
-cleandig a.b.c.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig a.b.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig x.d.e.f.test.dyndns A hidesoadetails dnssec
 mysqldiff 1 "Check if records are added"
 
 
@@ -29,9 +22,6 @@ send
 answer
 !
 
-cleandig a.b.c.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig a.b.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig x.d.e.f.test.dyndns A hidesoadetails dnssec
 mysqldiff 2 "Check if a.b.c.d.e.f is removed correctly"
 
 cleannsupdate <<!
@@ -42,7 +32,4 @@ send
 answer
 !
 
-cleandig a.b.c.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig a.b.d.e.f.test.dyndns A hidesoadetails dnssec
-cleandig x.d.e.f.test.dyndns A hidesoadetails dnssec
-mysqldiff 3 "Check if everything is removed correctly"
\ No newline at end of file
+mysqldiff 3 "Check if everything is removed correctly"

diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result b/regression-tests/1dyndns-update-deep-add-delete/expected_result
index dc49b54e7e8b99f18e2e2b041e89b1ecabefe497..e87f8a86502a48d4dcd673c0bdff001afadd19ce 100644 (file)
--- a/regression-tests/1dyndns-update-deep-add-delete/expected_result
+++ b/regression-tests/1dyndns-update-deep-add-delete/expected_result
@@ -1,33 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      a.b.c.d.e.f.test.dyndns.        IN      A       3600    127.0.0.1
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if records are added
 --- Start: diff start step.1 ---
 > a.b.c.d.e.f.test.dyndns      A       0       127.0.0.1       3600
@@ -46,18 +22,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
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if a.b.c.d.e.f is removed correctly
 --- Start: diff start step.2 ---
 > a.b.d.e.f.test.dyndns        A       0       127.0.0.1       3600
@@ -73,18 +37,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
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if everything is removed correctly
 --- Start: diff start step.3 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec b/regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec
index 11557ba4052025aed1ee6ae5d8bd65bf4a1b6bbb..a140ba5b4e4b33f364ba3e1fe9e38b06311b2f6a 100644 (file)
--- a/regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec
@@ -1,55 +1,9 @@
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      a.b.c.d.e.f.test.dyndns.        IN      A       3600    127.0.0.1
-0      a.b.c.d.e.f.test.dyndns.        IN      RRSIG   3600    A 8 8 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      a.b.c.d.e.f.test.dyndns.        IN      NSEC    86400   a.host.test.dyndns. A RRSIG NSEC
-1      a.b.c.d.e.f.test.dyndns.        IN      RRSIG   86400   NSEC 8 8 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    86400   a.b.d.e.f.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if records are added
 --- Start: diff start step.1 ---
 > a.b.c.d.e.f.test.dyndns      A       0       127.0.0.1       3600    'f e d c b a'   1
@@ -68,29 +22,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      a.b.d.e.f.test.dyndns.  IN      NSEC    86400   a.host.test.dyndns. A RRSIG NSEC
-1      a.b.d.e.f.test.dyndns.  IN      RRSIG   86400   NSEC 8 7 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    86400   a.b.d.e.f.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      a.b.d.e.f.test.dyndns.  IN      NSEC    86400   a.host.test.dyndns. A RRSIG NSEC
-1      a.b.d.e.f.test.dyndns.  IN      RRSIG   86400   NSEC 8 7 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      delete-add.test.dyndns. IN      NSEC    86400   a.b.d.e.f.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if a.b.c.d.e.f is removed correctly
 --- Start: diff start step.2 ---
 > a.b.d.e.f.test.dyndns        A       0       127.0.0.1       3600    'f e d b a'     1
@@ -106,33 +37,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if everything is removed correctly
 --- Start: diff start step.3 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow b/regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow
index 32828c43ddc536e725d7af4bb036f3111b94d74f..db42e51a5e54ef73b7b9d60234abaac1d7fadb4b 100644 (file)
--- a/regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow
+++ b/regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow
@@ -1,63 +1,9 @@
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      a.b.c.d.e.f.test.dyndns.        IN      A       3600    127.0.0.1
-0      a.b.c.d.e.f.test.dyndns.        IN      RRSIG   3600    A 8 8 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd IB3LD1S8C6DFQB62BFCODUG02VBAOUB3
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      q9ck1e2e54o9cjvh84jfksvi69umn4v2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q9CK1E2E54O9CJVH84JFKSVI69UMN4V4
-1      q9ck1e2e54o9cjvh84jfksvi69umn4v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd QM2M8QA1EA4HU5PLGU310CPNJ5G7BIE8
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if records are added
 --- Start: diff start step.1 ---
 > a.b.c.d.e.f.test.dyndns      A       0       127.0.0.1       3600    NULL    1
@@ -76,33 +22,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      6dll36pp2pvi784nttvqc1oevi57p2k2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd 6DLL36PP2PVI784NTTVQC1OEVI57P2K4
-1      6dll36pp2pvi784nttvqc1oevi57p2k2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd IB3LD1S8C6DFQB62BFCODUG02VBAOUB3
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd QM2M8QA1EA4HU5PLGU310CPNJ5G7BIE8
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd IB3LD1S8C6DFQB62BFCODUG02VBAOUB3
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      q9ck1e2e54o9cjvh84jfksvi69umn4v2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q9CK1E2E54O9CJVH84JFKSVI69UMN4V4
-1      q9ck1e2e54o9cjvh84jfksvi69umn4v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd QM2M8QA1EA4HU5PLGU310CPNJ5G7BIE8
-1      qm2m8qa1ea4hu5plgu310cpnj5g7bie6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if a.b.c.d.e.f is removed correctly
 --- Start: diff start step.2 ---
 > a.b.d.e.f.test.dyndns        A       0       127.0.0.1       3600    NULL    1
@@ -118,39 +37,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd EPFP6242BI1891C397KJDHSD0H04OTMT
-1      epfp6242bi1891c397kjdhsd0h04otmr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd OTDRJSDLB78JMSU0IC15A7U25QUQPHHT
-1      otdrjsdlb78jmsu0ic15a7u25quqphhr.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd U36F0TJOOQV1KSPATTO6QNS0VAP731V3 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if everything is removed correctly
 --- Start: diff start step.3 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3 b/regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3
index 34f440a97c8f6b2e8001f1b397c0a92eae3f5fd2..7090db0de75520503ec1683c9b1ee4fa44b83ed0 100644 (file)
--- a/regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3
@@ -1,61 +1,9 @@
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-0      a.b.c.d.e.f.test.dyndns.        IN      A       3600    127.0.0.1
-0      a.b.c.d.e.f.test.dyndns.        IN      RRSIG   3600    A 8 8 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd ITUDUKE14PTHSNO7II6H5SBOSHR8RFQS
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd R9S1CJ8DKMNMENJN95STI8NHH9UTPQ9K A RRSIG
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if records are added
 --- Start: diff start step.1 ---
 > a.b.c.d.e.f.test.dyndns      A       0       127.0.0.1       3600    '2u8m12oibofk0fqhk11s40k8vfnhhkug'      1
@@ -74,31 +22,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd 8PQJV4B3M0LCFMVAE0HP394LC154L1I7 CNAME RRSIG
-1      4i84rosksbmegcqfnkf6n6ci093h7rq4.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd ITUDUKE14PTHSNO7II6H5SBOSHR8RFQS
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd R9S1CJ8DKMNMENJN95STI8NHH9UTPQ9K A RRSIG
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-0      a.b.d.e.f.test.dyndns.  IN      A       3600    127.0.0.1
-0      a.b.d.e.f.test.dyndns.  IN      RRSIG   3600    A 8 7 3600 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd ITUDUKE14PTHSNO7II6H5SBOSHR8RFQS
-1      ib3ld1s8c6dfqb62bfcodug02vbaoub2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd R9S1CJ8DKMNMENJN95STI8NHH9UTPQ9K A RRSIG
-1      q75pnoe7pb74pnd6ogn44t5btuurbhrf.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if a.b.c.d.e.f is removed correctly
 --- Start: diff start step.2 ---
 > a.b.d.e.f.test.dyndns        A       0       127.0.0.1       3600    'fqhg4b60on9mnerf7blipai4ej9gkpdk'      1
@@ -114,39 +37,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.c.d.e.f.test.dyndns.', qtype=A
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='a.b.d.e.f.test.dyndns.', qtype=A
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd Q75PNOE7PB74PND6OGN44T5BTUURBHRF A RRSIG
-1      lresbbp3lv8blgj9fsgtdmm4q7vj3d6j.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 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   86400   1 [flags] 1 abcd 2GP5RDNJOQ5OOSPC5O1IH9LALI101DI8 NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      u36f0tjooqv1kspatto6qns0vap731v2.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='x.d.e.f.test.dyndns.', qtype=A
 Check if everything is removed correctly
 --- Start: diff start step.3 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-delegate/command b/regression-tests/1dyndns-update-deep-delegate/command
index 0ca6eb2cfb7dacc5f268eb748121f5a6ff9420f6..0999576851e1d2c96f96320423862ae66552f3aa 100755 (executable)
--- a/regression-tests/1dyndns-update-deep-delegate/command
+++ b/regression-tests/1dyndns-update-deep-delegate/command
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-cleandig delegate1.test.dyndns ANY hidesoadetails
 mysqldiff
 
 cleannsupdate <<!
@@ -14,8 +13,6 @@ send
 answer
 !
 
-cleandig delegate.test.dyndns ANY hidesoadetails
-cleandig other.very.deep.delegate.test.dyndns hidesoadetails
 mysqldiff 1 "Check delegates added"
 
 cleannsupdate <<!
@@ -29,6 +26,4 @@ send
 answer
 !
 
-cleandig delegate.test.dyndns ANY hidesoadetails
-cleandig other.very.deep.delegate.test.dyndns hidesoadetails
-mysqldiff 2 "Check delegates deleted"
\ No newline at end of file
+mysqldiff 2 "Check delegates deleted"

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result b/regression-tests/1dyndns-update-deep-delegate/expected_result
index 8b621d959c9c34c1375bb77bbeff2f90d27c812f..8975cfad2af0357d37e42c038bd68bffbd15fe3b 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result
@@ -1,16 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
-2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates added
 --- Start: diff start step.1 ---
 > delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600
@@ -25,9 +18,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted
 --- Start: diff start step.2 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec b/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
index ff06a02b3ed67e216650822b5374f38bc7446e5b..40f3daf12de8fcce2e2f8b5af73516084db18ff2 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
@@ -1,16 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
-2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates added
 --- Start: diff start step.1 ---
 > delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600    'delegate'      0
@@ -25,9 +18,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted
 --- Start: diff start step.2 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow b/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
index e920f22134d0845af2dc3b0d8c4c17bc045636f5..3eeee94efb138d01afc01cc020d5bff53acfd3e3 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
@@ -1,16 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
-2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates added
 --- Start: diff start step.1 ---
 > delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600    NULL    0
@@ -25,9 +18,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted
 --- Start: diff start step.2 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3 b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
index 7b39fca520f14271139aa55f98ddfadb52766638..87456ec4e8f3084bae623b421685f497c19419df 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
@@ -1,16 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
-2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates added
 --- Start: diff start step.1 ---
 > delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600    'vg1uvfh5go60po37nof33f260sno3bnc'      0
@@ -25,9 +18,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted
 --- Start: diff start step.2 ---
 no difference

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout
index e920f22134d0845af2dc3b0d8c4c17bc045636f5..3eeee94efb138d01afc01cc020d5bff53acfd3e3 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout
@@ -1,16 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
-2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates added
 --- Start: diff start step.1 ---
 > delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600    NULL    0
@@ -25,9 +18,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted
 --- Start: diff start step.2 ---
 no difference

diff --git a/regression-tests/1dyndns-update-delegate/command b/regression-tests/1dyndns-update-delegate/command
index 6414470b2762a3b3b97bbb9052a2c8ab1dec0c64..fff31d126b4c0b3e5b71ed0743a84d17fd34b1ed 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate/command
+++ b/regression-tests/1dyndns-update-delegate/command
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-cleandig delegate1.test.dyndns ANY hidesoadetails
 mysqldiff
 
 cleannsupdate <<!
@@ -14,7 +13,6 @@ send
 answer
 !
 
-cleandig delegate1.test.dyndns ANY
 mysqldiff 1 'Check delegate1 added correctly'
 
 cleannsupdate <<!
@@ -28,7 +26,6 @@ send
 answer
 !
 
-cleandig delegate2.test.dyndns ANY
 mysqldiff 2 'Check delegate2 added correctly'
 
 cleannsupdate <<!
@@ -40,12 +37,6 @@ send
 answer
 !
 
-cleandig delegate2.test.dyndns ANY hidesoadetails
-cleandig delegate1.test.dyndns ANY hidesoadetails
-cleandig ns1.delegate1.test.dyndns ANY
-cleandig ns2.delegate1.test.dyndns ANY
-cleandig ns1.delegate2.test.dyndns ANY
-cleandig ns2.delegate2.test.dyndns ANY
 mysqldiff 3 'check delegate delete'
 
 cleannsupdate <<!
@@ -59,8 +50,4 @@ send
 answer
 !
 
-cleandig ns1.delegate1.test.dyndns ANY hidesoadetails
-cleandig ns2.delegate1.test.dyndns ANY hidesoadetails
-cleandig ns1.delegate2.test.dyndns ANY hidesoadetails
-cleandig ns2.delegate2.test.dyndns ANY hidesoadetails
-mysqldiff 4 'Check if glue records are deleted and zone back to how we started'
\ No newline at end of file
+mysqldiff 4 'Check if glue records are deleted and zone back to how we started'

diff --git a/regression-tests/1dyndns-update-delegate/expected_result b/regression-tests/1dyndns-update-delegate/expected_result
index 7ad42e284914f114e7e6345b2e46ac1a5dc8de18..5b4fd77ee1a10ac7c8b943dda4e317fe78ec070e 100644 (file)
--- a/regression-tests/1dyndns-update-delegate/expected_result
+++ b/regression-tests/1dyndns-update-delegate/expected_result
@@ -1,18 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Check delegate1 added correctly
 --- Start: diff start step.1 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600
@@ -27,12 +18,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
 Check delegate2 added correctly
 --- Start: diff start step.2 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600
@@ -51,24 +36,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
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 check delegate delete
 --- Start: diff start step.3 ---
 > delegate1.test.dyndns        NULL    NULL    NULL    NULL
@@ -85,18 +52,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 Check if glue records are deleted and zone back to how we started
 --- Start: diff start step.4 ---
 no difference

diff --git a/regression-tests/1dyndns-update-delegate/expected_result.dnssec b/regression-tests/1dyndns-update-delegate/expected_result.dnssec
index 6843f738846e9c70bb5ef6ebc683971fb7ee77a1..bf8e1f45207d7768dba82c3f7d98e782fea4faaa 100644 (file)
--- a/regression-tests/1dyndns-update-delegate/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-delegate/expected_result.dnssec
@@ -1,18 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Check delegate1 added correctly
 --- Start: diff start step.1 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    'delegate1'     0
@@ -27,12 +18,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
 Check delegate2 added correctly
 --- Start: diff start step.2 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    'delegate1'     0
@@ -51,24 +36,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
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 check delegate delete
 --- Start: diff start step.3 ---
 > delegate1.test.dyndns        NULL    NULL    NULL    NULL    NULL    1
@@ -85,18 +52,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 Check if glue records are deleted and zone back to how we started
 --- Start: diff start step.4 ---
 no difference

diff --git a/regression-tests/1dyndns-update-delegate/expected_result.narrow b/regression-tests/1dyndns-update-delegate/expected_result.narrow
index ec250e1a0923aa86a24562970aea96e4f87e83b5..4949f498d688ef19692164d58863aaa313fcac65 100644 (file)
--- a/regression-tests/1dyndns-update-delegate/expected_result.narrow
+++ b/regression-tests/1dyndns-update-delegate/expected_result.narrow
@@ -1,18 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Check delegate1 added correctly
 --- Start: diff start step.1 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    NULL    0
@@ -27,12 +18,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
 Check delegate2 added correctly
 --- Start: diff start step.2 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    NULL    0
@@ -51,24 +36,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
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 check delegate delete
 --- Start: diff start step.3 ---
 > delegate1.test.dyndns        NULL    NULL    NULL    NULL    ''      1
@@ -85,18 +52,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 Check if glue records are deleted and zone back to how we started
 --- Start: diff start step.4 ---
 no difference

diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3 b/regression-tests/1dyndns-update-delegate/expected_result.nsec3
index d2ec425f4ee1520a79ed19bb35eb135f5083b677..20983a4704e5680d1e0cd62315f7fdac218bfa67 100644 (file)
--- a/regression-tests/1dyndns-update-delegate/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-delegate/expected_result.nsec3
@@ -1,18 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Check delegate1 added correctly
 --- Start: diff start step.1 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    'h4tlip64juuiun7hbl0bsvqkkshh3pkj'      0
@@ -27,12 +18,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
 Check delegate2 added correctly
 --- Start: diff start step.2 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    'h4tlip64juuiun7hbl0bsvqkkshh3pkj'      0
@@ -51,24 +36,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
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 check delegate delete
 --- Start: diff start step.3 ---
 > delegate1.test.dyndns        NULL    NULL    NULL    NULL    'h4tlip64juuiun7hbl0bsvqkkshh3pkj'      1
@@ -85,18 +52,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 Check if glue records are deleted and zone back to how we started
 --- Start: diff start step.4 ---
 no difference

diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout b/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout
index 9fc61724bd809e86ce180c3ad026ef9bb2113da0..3f211bf67658ddfda3920f3a87045939133988a0 100644 (file)
--- a/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout
+++ b/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout
@@ -1,18 +1,9 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
 Check delegate1 added correctly
 --- Start: diff start step.1 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    NULL    0
@@ -27,12 +18,6 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
 Check delegate2 added correctly
 --- Start: diff start step.2 ---
 > delegate1.test.dyndns        NS      0       ns1.delegate1.test.dyndns       3600    NULL    0
@@ -51,24 +36,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
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 check delegate delete
 --- Start: diff start step.3 ---
 > delegate1.test.dyndns        NULL    NULL    NULL    NULL    'h4tlip64juuiun7hbl0bsvqkkshh3pkj'      1
@@ -85,18 +52,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
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
 Check if glue records are deleted and zone back to how we started
 --- Start: diff start step.4 ---
 no difference