Add mysqldiff to 1dyndns-update-nsec3params

diff --git a/regression-tests/1dyndns-update-nsec3params/command b/regression-tests/1dyndns-update-nsec3params/command
index e62d4bdaaa5d25153631c4d0a98cd9ba05fda24d..ccadd1ee1cef46971dffe18c0abda301253c15ba 100755 (executable)
--- a/regression-tests/1dyndns-update-nsec3params/command
+++ b/regression-tests/1dyndns-update-nsec3params/command
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
        
 NSEC3=`cleandig test.dyndns NSEC3PARAM hidesoadetails dnssec`
 echo $NSEC3
@@ -6,10 +6,12 @@ HAVENSEC3=`echo $NSEC3 | egrep 'IN[[:space:]]NSEC3PARAM' | wc -l`
 
 cleandig b.host.test.dyndns A hidesoadetails dnssec
 
+mysqldiff 
+
 cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
-update add test.dyndns. 3600 NSEC3PARAM 1 1 10 DCBE
+update add test.dyndns. 3600 NSEC3PARAM 1 $optout 10 DCBE
 send
 answer
 !
@@ -17,6 +19,8 @@ answer
 cleandig test.dyndns NSEC3PARAM hidesoadetails dnssec
 cleandig b.host.test.dyndns A hidesoadetails dnssec
 
+mysqldiff 1 "Check if NSEC3PARAM record exists and A-record added"
+
 cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
@@ -28,16 +32,20 @@ answer
 cleandig test.dyndns NSEC3PARAM hidesoadetails dnssec
 cleandig b.host.test.dyndns A hidesoadetails dnssec
 
+mysqldiff 2 "Check if NSEC3PARAM is deleted"
+
 if [ $HAVENSEC3 != 0 ]
 then
        cleannsupdate <<!
        server $nameserver $port
        zone test.dyndns
-       update add test.dyndns. 3600 NSEC3PARAM 1 1 1 abcd
+       update add test.dyndns. 3600 NSEC3PARAM 1 $optout 1 abcd
        send
        answer
 !
 
        cleandig test.dyndns NSEC3PARAM hidesoadetails dnssec
        cleandig b.host.test.dyndns A hidesoadetails dnssec
+
+       mysqldiff 3 'Check if NSEC3PARAM is added again'
 fi

diff --git a/regression-tests/1dyndns-update-nsec3params/expected_result b/regression-tests/1dyndns-update-nsec3params/expected_result
index b0baef6794fe418fabf3a9a0863060e185301cc4..ce55d917b45f128506bfb8bdd4fbb5d33f1be19b 100644 (file)
--- a/regression-tests/1dyndns-update-nsec3params/expected_result
+++ b/regression-tests/1dyndns-update-nsec3params/expected_result
@@ -28,6 +28,58 @@ Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
+Check if NSEC3PARAM record exists and A-record added
+--- Start: diff start step.1 ---
+< a.host.test.dyndns   A       0       1.1.1.1 3600    'host a'        1
+< cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    'cname1'        1
+< cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    'cname2'        1
+< delete-add.test.dyndns       A       0       127.0.0.108     3600    'delete-add'    1
+< delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'delete-add'    1
+< e.host.test.dyndns   A       0       1.1.1.1 3600    'host e'        1
+< host-1.test.dyndns   A       0       127.0.0.101     3600    'host-1'        1
+< host-2.test.dyndns   A       0       127.0.0.102     3600    'host-2'        1
+< host-3.test.dyndns   A       0       127.0.0.103     3600    'host-3'        1
+< host.test.dyndns     NULL    NULL    NULL    NULL    NULL    1
+< multi.test.dyndns    A       0       127.0.0.1       3600    'multi' 1
+< multi.test.dyndns    A       0       127.0.0.2       3600    'multi' 1
+< multi.test.dyndns    A       0       127.0.0.3       3600    'multi' 1
+< ns1.test.dyndns      A       0       127.0.0.1       3600    'ns1'   1
+< ns2.test.dyndns      A       0       127.0.0.2       3600    'ns2'   1
+< replace.test.dyndns  A       0       127.0.0.1       3600    'replace'       1
+< test.dyndns  MX      10      host-1.test.dyndns      3600    ''      1
+< test.dyndns  MX      20      host-2.test.dyndns      3600    ''      1
+< test.dyndns  NS      0       ns1.test.dyndns 3600    ''      1
+< test.dyndns  NS      0       ns2.test.dyndns 3600    ''      1
+< ttl.test.dyndns      A       0       127.0.0.1       3600    'ttl'   1
+< txt.test.dyndns      TXT     0       "This is some text"     3600    'txt'   1
+< wild.test.dyndns     NULL    NULL    NULL    NULL    NULL    1
+< *.wild.test.dyndns   A       0       127.0.1.255     3600    'wild *'        1
+> a.host.test.dyndns   A       0       1.1.1.1 3600    '56ack4bc22vbotda2c16ovse4fn25rq9'      1
+> cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    '8uit4g0g6a2bhd4k1jqm8vss2ped90or'      1
+> cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    '4kld1och52v50u3ng1hm8r7960vrsvom'      1
+> delete-add.test.dyndns       A       0       127.0.0.108     3600    'qos1o6fh2fhqsrobhfu5fo4jod7kbm31'      1
+> delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'qos1o6fh2fhqsrobhfu5fo4jod7kbm31'      1
+> e.host.test.dyndns   A       0       1.1.1.1 3600    'feibo0ol87v167hotqml6lfp3ertsvsm'      1
+> host-1.test.dyndns   A       0       127.0.0.101     3600    '5oj69l0a9ivclkj9od2jo4nhea4dqqrr'      1
+> host-2.test.dyndns   A       0       127.0.0.102     3600    'h5scf8d2fiklli0eejrr6ib9uurde8jo'      1
+> host-3.test.dyndns   A       0       127.0.0.103     3600    'g29j5ivi5i6rr1aoe2l59a9s1rohha2o'      1
+> host.test.dyndns     NULL    NULL    NULL    NULL    'ac2jl1kik929tr9i5rfcmbucm547n51a'      1
+> multi.test.dyndns    A       0       127.0.0.1       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> multi.test.dyndns    A       0       127.0.0.2       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> multi.test.dyndns    A       0       127.0.0.3       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> ns1.test.dyndns      A       0       127.0.0.1       3600    'uba3qp1vffon9pq2r07e7ldrnh5mg90v'      1
+> ns2.test.dyndns      A       0       127.0.0.2       3600    'pe3h59f3ru6vid4ok0t4tsu6d0ndrvhs'      1
+> replace.test.dyndns  A       0       127.0.0.1       3600    'hcj69ok6nqcmebhuprvga4kagcb9cfrf'      1
+> test.dyndns  MX      10      host-1.test.dyndns      3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  MX      20      host-2.test.dyndns      3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  NS      0       ns1.test.dyndns 3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  NS      0       ns2.test.dyndns 3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> ttl.test.dyndns      A       0       127.0.0.1       3600    'fa878afqjafu98itdnj0744n7g1f8uei'      1
+> txt.test.dyndns      TXT     0       "This is some text"     3600    'rps6lu4mfq3fl71qp8np9gf8addr9k8t'      1
+> wild.test.dyndns     NULL    NULL    NULL    NULL    'a5s5svjou2lfs8r30prflluuqqui51q8'      1
+> *.wild.test.dyndns   A       0       127.0.1.255     3600    'ee295ak1ndt9o0rll1a4rppb4naov4qm'      1
+--- End: diff start step.1 ---
+
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
@@ -50,3 +102,8 @@ Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
+Check if NSEC3PARAM is deleted
+--- Start: diff start step.2 ---
+no difference
+--- End: diff start step.2 ---
+

diff --git a/regression-tests/1dyndns-update-nsec3params/expected_result.nsec3 b/regression-tests/1dyndns-update-nsec3params/expected_result.nsec3
index f22fadd799f47ebaf0ec17016a40ddbdecf66fc1..8509fd51ca91832861f19208abce2a35f3702319 100644 (file)
--- a/regression-tests/1dyndns-update-nsec3params/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-nsec3params/expected_result.nsec3
@@ -30,6 +30,58 @@ Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
+Check if NSEC3PARAM record exists and A-record added
+--- Start: diff start step.1 ---
+< a.host.test.dyndns   A       0       1.1.1.1 3600    'dsa3ti9nu3apdsvl3f63qlvakv555sr6'      1
+< cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    '8pqjv4b3m0lcfmvae0hp394lc154l1i7'      1
+< cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    '4i84rosksbmegcqfnkf6n6ci093h7rq4'      1
+< delete-add.test.dyndns       A       0       127.0.0.108     3600    'slsck1enia56lrkr5gep7clu9j1o5ifn'      1
+< delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'slsck1enia56lrkr5gep7clu9j1o5ifn'      1
+< e.host.test.dyndns   A       0       1.1.1.1 3600    '8ti9tgh8d81frr5vr4o1o5bvko42v9dq'      1
+< host-1.test.dyndns   A       0       127.0.0.101     3600    'tdhv9cbk13jg8drivldhsl3mji8qqqe2'      1
+< host-2.test.dyndns   A       0       127.0.0.102     3600    's30oprhqrekh5suh6l530kd668elk9os'      1
+< host-3.test.dyndns   A       0       127.0.0.103     3600    'gou9ao3rkdcnhqldf4056m9oigmtkuh6'      1
+< host.test.dyndns     NULL    NULL    NULL    NULL    'lmrsadk2bb62qpruaules5i5ap06cp55'      1
+< multi.test.dyndns    A       0       127.0.0.1       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< multi.test.dyndns    A       0       127.0.0.2       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< multi.test.dyndns    A       0       127.0.0.3       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< ns1.test.dyndns      A       0       127.0.0.1       3600    '2gp5rdnjoq5oospc5o1ih9lali101di8'      1
+< ns2.test.dyndns      A       0       127.0.0.2       3600    'fqu365vn7br5csv8cg6ne9v8ha6d008p'      1
+< replace.test.dyndns  A       0       127.0.0.1       3600    'ituduke14pthsno7ii6h5sboshr8rfqs'      1
+< test.dyndns  MX      10      host-1.test.dyndns      3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  MX      20      host-2.test.dyndns      3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  NS      0       ns1.test.dyndns 3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  NS      0       ns2.test.dyndns 3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< ttl.test.dyndns      A       0       127.0.0.1       3600    'q75pnoe7pb74pnd6ogn44t5btuurbhrf'      1
+< txt.test.dyndns      TXT     0       "This is some text"     3600    'lbj6718q27qsm7q020pqmhj0emg1neac'      1
+< wild.test.dyndns     NULL    NULL    NULL    NULL    'r9s1cj8dkmnmenjn95sti8nhh9utpq9k'      1
+< *.wild.test.dyndns   A       0       127.0.1.255     3600    'lresbbp3lv8blgj9fsgtdmm4q7vj3d6j'      1
+> a.host.test.dyndns   A       0       1.1.1.1 3600    '56ack4bc22vbotda2c16ovse4fn25rq9'      1
+> cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    '8uit4g0g6a2bhd4k1jqm8vss2ped90or'      1
+> cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    '4kld1och52v50u3ng1hm8r7960vrsvom'      1
+> delete-add.test.dyndns       A       0       127.0.0.108     3600    'qos1o6fh2fhqsrobhfu5fo4jod7kbm31'      1
+> delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'qos1o6fh2fhqsrobhfu5fo4jod7kbm31'      1
+> e.host.test.dyndns   A       0       1.1.1.1 3600    'feibo0ol87v167hotqml6lfp3ertsvsm'      1
+> host-1.test.dyndns   A       0       127.0.0.101     3600    '5oj69l0a9ivclkj9od2jo4nhea4dqqrr'      1
+> host-2.test.dyndns   A       0       127.0.0.102     3600    'h5scf8d2fiklli0eejrr6ib9uurde8jo'      1
+> host-3.test.dyndns   A       0       127.0.0.103     3600    'g29j5ivi5i6rr1aoe2l59a9s1rohha2o'      1
+> host.test.dyndns     NULL    NULL    NULL    NULL    'ac2jl1kik929tr9i5rfcmbucm547n51a'      1
+> multi.test.dyndns    A       0       127.0.0.1       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> multi.test.dyndns    A       0       127.0.0.2       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> multi.test.dyndns    A       0       127.0.0.3       3600    'lavvds84bcal6n6qnavn3q1u4jcpjev9'      1
+> ns1.test.dyndns      A       0       127.0.0.1       3600    'uba3qp1vffon9pq2r07e7ldrnh5mg90v'      1
+> ns2.test.dyndns      A       0       127.0.0.2       3600    'pe3h59f3ru6vid4ok0t4tsu6d0ndrvhs'      1
+> replace.test.dyndns  A       0       127.0.0.1       3600    'hcj69ok6nqcmebhuprvga4kagcb9cfrf'      1
+> test.dyndns  MX      10      host-1.test.dyndns      3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  MX      20      host-2.test.dyndns      3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  NS      0       ns1.test.dyndns 3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> test.dyndns  NS      0       ns2.test.dyndns 3600    '62qbu7pvpt7cm7bdpu7geb3je1l0aure'      1
+> ttl.test.dyndns      A       0       127.0.0.1       3600    'fa878afqjafu98itdnj0744n7g1f8uei'      1
+> txt.test.dyndns      TXT     0       "This is some text"     3600    'rps6lu4mfq3fl71qp8np9gf8addr9k8t'      1
+> wild.test.dyndns     NULL    NULL    NULL    NULL    'a5s5svjou2lfs8r30prflluuqqui51q8'      1
+> *.wild.test.dyndns   A       0       127.0.1.255     3600    'ee295ak1ndt9o0rll1a4rppb4naov4qm'      1
+--- End: diff start step.1 ---
+
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
@@ -52,6 +104,58 @@ Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
+Check if NSEC3PARAM is deleted
+--- Start: diff start step.2 ---
+< a.host.test.dyndns   A       0       1.1.1.1 3600    'dsa3ti9nu3apdsvl3f63qlvakv555sr6'      1
+< cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    '8pqjv4b3m0lcfmvae0hp394lc154l1i7'      1
+< cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    '4i84rosksbmegcqfnkf6n6ci093h7rq4'      1
+< delete-add.test.dyndns       A       0       127.0.0.108     3600    'slsck1enia56lrkr5gep7clu9j1o5ifn'      1
+< delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'slsck1enia56lrkr5gep7clu9j1o5ifn'      1
+< e.host.test.dyndns   A       0       1.1.1.1 3600    '8ti9tgh8d81frr5vr4o1o5bvko42v9dq'      1
+< host-1.test.dyndns   A       0       127.0.0.101     3600    'tdhv9cbk13jg8drivldhsl3mji8qqqe2'      1
+< host-2.test.dyndns   A       0       127.0.0.102     3600    's30oprhqrekh5suh6l530kd668elk9os'      1
+< host-3.test.dyndns   A       0       127.0.0.103     3600    'gou9ao3rkdcnhqldf4056m9oigmtkuh6'      1
+< host.test.dyndns     NULL    NULL    NULL    NULL    'lmrsadk2bb62qpruaules5i5ap06cp55'      1
+< multi.test.dyndns    A       0       127.0.0.1       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< multi.test.dyndns    A       0       127.0.0.2       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< multi.test.dyndns    A       0       127.0.0.3       3600    'tntcbdfsihhd24nt96bq9973vd019u43'      1
+< ns1.test.dyndns      A       0       127.0.0.1       3600    '2gp5rdnjoq5oospc5o1ih9lali101di8'      1
+< ns2.test.dyndns      A       0       127.0.0.2       3600    'fqu365vn7br5csv8cg6ne9v8ha6d008p'      1
+< replace.test.dyndns  A       0       127.0.0.1       3600    'ituduke14pthsno7ii6h5sboshr8rfqs'      1
+< test.dyndns  MX      10      host-1.test.dyndns      3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  MX      20      host-2.test.dyndns      3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  NS      0       ns1.test.dyndns 3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< test.dyndns  NS      0       ns2.test.dyndns 3600    'u36f0tjooqv1kspatto6qns0vap731v2'      1
+< ttl.test.dyndns      A       0       127.0.0.1       3600    'q75pnoe7pb74pnd6ogn44t5btuurbhrf'      1
+< txt.test.dyndns      TXT     0       "This is some text"     3600    'lbj6718q27qsm7q020pqmhj0emg1neac'      1
+< wild.test.dyndns     NULL    NULL    NULL    NULL    'r9s1cj8dkmnmenjn95sti8nhh9utpq9k'      1
+< *.wild.test.dyndns   A       0       127.0.1.255     3600    'lresbbp3lv8blgj9fsgtdmm4q7vj3d6j'      1
+> a.host.test.dyndns   A       0       1.1.1.1 3600    'host a'        1
+> cname1.test.dyndns   CNAME   0       host-1.test.dyndns      3600    'cname1'        1
+> cname2.test.dyndns   CNAME   0       host-2.test.dyndns      3600    'cname2'        1
+> delete-add.test.dyndns       A       0       127.0.0.108     3600    'delete-add'    1
+> delete-add.test.dyndns       TXT     0       "Should be gone after a while"  3600    'delete-add'    1
+> e.host.test.dyndns   A       0       1.1.1.1 3600    'host e'        1
+> host-1.test.dyndns   A       0       127.0.0.101     3600    'host-1'        1
+> host-2.test.dyndns   A       0       127.0.0.102     3600    'host-2'        1
+> host-3.test.dyndns   A       0       127.0.0.103     3600    'host-3'        1
+> host.test.dyndns     NULL    NULL    NULL    NULL    NULL    1
+> multi.test.dyndns    A       0       127.0.0.1       3600    'multi' 1
+> multi.test.dyndns    A       0       127.0.0.2       3600    'multi' 1
+> multi.test.dyndns    A       0       127.0.0.3       3600    'multi' 1
+> ns1.test.dyndns      A       0       127.0.0.1       3600    'ns1'   1
+> ns2.test.dyndns      A       0       127.0.0.2       3600    'ns2'   1
+> replace.test.dyndns  A       0       127.0.0.1       3600    'replace'       1
+> test.dyndns  MX      10      host-1.test.dyndns      3600    ''      1
+> test.dyndns  MX      20      host-2.test.dyndns      3600    ''      1
+> test.dyndns  NS      0       ns1.test.dyndns 3600    ''      1
+> test.dyndns  NS      0       ns2.test.dyndns 3600    ''      1
+> ttl.test.dyndns      A       0       127.0.0.1       3600    'ttl'   1
+> txt.test.dyndns      TXT     0       "This is some text"     3600    'txt'   1
+> wild.test.dyndns     NULL    NULL    NULL    NULL    NULL    1
+> *.wild.test.dyndns   A       0       127.0.1.255     3600    'wild *'        1
+--- End: diff start step.2 ---
+
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
@@ -74,3 +178,8 @@ Reply to question for qname='test.dyndns.', qtype=NSEC3PARAM
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=A
+Check if NSEC3PARAM is added again
+--- Start: diff start step.3 ---
+no difference
+--- End: diff start step.3 ---
+

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 0774a3f0789dfe5c4ca80de5ffe75216e9cf229d..165cf810c192f6e9c2dc00ee10324f096e26cbdc 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -593,6 +593,7 @@ export context
 export extracontexts
 export skipreasons
 export testsdir
+export optout
 
 if [ $presigned = yes ]
 then