From: Kees Monshouwer Date: Fri, 1 Nov 2013 17:19:39 +0000 (+0100) Subject: reduce the use of cleandig in dyndns tests X-Git-Tag: rec-3.6.0-rc1~367^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb445145eec0fc91ec04ec39d79ac39dc8906be5;p=pdns 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 73f786352..4fcb5f4e5 100755 --- 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 <>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 11557ba40..a140ba5b4 100644 --- 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 32828c43d..db42e51a5 100644 --- 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 34f440a97..7090db0de 100644 --- 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 0ca6eb2cf..099957685 100755 --- 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 <>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 ff06a02b3..40f3daf12 100644 --- 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 e920f2213..3eeee94ef 100644 --- 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 7b39fca52..87456ec4e 100644 --- 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 e920f2213..3eeee94ef 100644 --- 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 6414470b2..fff31d126 100755 --- 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 <>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 6843f7388..bf8e1f452 100644 --- 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 ec250e1a0..4949f498d 100644 --- 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 d2ec425f4..20983a470 100644 --- 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 9fc61724b..3f211bf67 100644 --- 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