From: Ruben d'Arco Date: Sat, 18 May 2013 12:18:10 +0000 (+0200) Subject: Correct update-delegate-in-between & add mysqldiff X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df71ef7c0685eda81fb00407a2e1767d8ec8354;p=thirdparty%2Fpdns.git Correct update-delegate-in-between & add mysqldiff --- diff --git a/regression-tests/1dyndns-update-delegate-in-between/command b/regression-tests/1dyndns-update-delegate-in-between/command index b3a6f44cc5..a68cf0e365 100755 --- a/regression-tests/1dyndns-update-delegate-in-between/command +++ b/regression-tests/1dyndns-update-delegate-in-between/command @@ -11,6 +11,8 @@ cleandig c.c.host.test.dyndns ANY dnssec hidesoadetails cleandig d.d.host.test.dyndns ANY dnssec hidesoadetails cleandig e.e.host.test.dyndns ANY dnssec hidesoadetails +mysqldiff + cleannsupdate < c.host.test.dyndns NS 0 ns1.c.host.test.dyndns 3600 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 +--- End: diff start step.1 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 2 . IN OPT 32768 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 @@ -100,6 +106,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate is deleted and glue auth=1 +--- Start: diff start step.2 --- +> c.host.test.dyndns NULL NULL NULL NULL +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 +--- End: diff start step.2 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 2 . IN OPT 32768 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 @@ -150,6 +162,11 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if we are back to normal +--- Start: diff start step.3 --- +no difference +--- End: diff start step.3 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 2 . IN OPT 32768 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec b/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec index bec83f9938..555f22fd2d 100644 --- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec +++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec @@ -99,6 +99,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate and glue are added correctly. +--- Start: diff start step.1 --- +> c.host.test.dyndns NS 0 ns1.c.host.test.dyndns 3600 'host c' 0 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 NULL 0 +--- End: diff start step.1 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN NSEC 86400 c.host.test.dyndns. A RRSIG NSEC 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... @@ -196,6 +202,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate is deleted and glue auth=1 +--- Start: diff start step.2 --- +> c.host.test.dyndns NULL NULL NULL NULL NULL 1 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 'host c ns1' 1 +--- End: diff start step.2 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN NSEC 86400 ns1.c.host.test.dyndns. A RRSIG NSEC 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... @@ -295,6 +307,11 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if we are back to normal +--- Start: diff start step.3 --- +no difference +--- End: diff start step.3 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN NSEC 86400 e.host.test.dyndns. A RRSIG NSEC 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow index 58295f1b64..008635edce 100644 --- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow +++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow @@ -113,6 +113,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate and glue are added correctly. +--- Start: diff start step.1 --- +> c.host.test.dyndns NS 0 ns1.c.host.test.dyndns 3600 NULL 0 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 NULL 0 +--- End: diff start step.1 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -224,6 +230,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate is deleted and glue auth=1 +--- Start: diff start step.2 --- +> c.host.test.dyndns NULL NULL NULL NULL '' 1 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 '' 1 +--- End: diff start step.2 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -335,6 +347,11 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if we are back to normal +--- Start: diff start step.3 --- +no difference +--- End: diff start step.3 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 b/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 index e20099d231..67eafa690d 100644 --- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 +++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 @@ -105,6 +105,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate and glue are added correctly. +--- Start: diff start step.1 --- +> c.host.test.dyndns NS 0 ns1.c.host.test.dyndns 3600 'fgun0ru4oe3g76tr551hg97mpu37b6mi' 0 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 NULL 0 +--- End: diff start step.1 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -122,8 +128,8 @@ Reply to question for qname='a.host.test.dyndns.', qtype=ANY Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='b.host.test.dyndns.', qtype=ANY 1 c.host.test.dyndns. IN NS 3600 ns1.c.host.test.dyndns. -1 dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns. IN NSEC3 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 fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS +1 fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ... 1 lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J 1 lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -157,7 +163,7 @@ Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='f.host.test.dyndns.', qtype=ANY 1 8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG 1 8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ... -1 dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG +1 dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG 1 dsa3ti9nu3apdsvl3f63qlvakv555sr6.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 @@ -176,8 +182,8 @@ Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY 1 c.host.test.dyndns. IN NS 3600 ns1.c.host.test.dyndns. -1 dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns. IN NSEC3 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 fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS +1 fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ... 1 lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns. IN NSEC3 86400 1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J 1 lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -208,6 +214,12 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if delegate is deleted and glue auth=1 +--- Start: diff start step.2 --- +> c.host.test.dyndns NULL NULL NULL NULL 'fgun0ru4oe3g76tr551hg97mpu37b6mi' 1 +> ns1.c.host.test.dyndns A 0 192.168.0.1 3600 '6ovod1m5kossaiiqprlaf42prqrkeaq7' 1 +--- End: diff start step.2 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768 @@ -311,6 +323,11 @@ Answer: ;; ZONE SECTION: ;test.dyndns. IN SOA +Check if we are back to normal +--- Start: diff start step.3 --- +no difference +--- End: diff start step.3 --- + 0 a.host.test.dyndns. IN A 3600 1.1.1.1 0 a.host.test.dyndns. IN RRSIG 3600 A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ... 2 . IN OPT 32768