Add out-of-zone additional data test.

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

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

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 72c7a006324b5e24e154e8f34269f8b6aab1dbbc..bcbeb035f88d05621d9bb602b0a2a6a49a80e976 100644 (file)
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20100,24 +20100,25 @@
 +toomuchinfo-b.example.com:192.168.99.90:120
 +usa-ns1.usa.example.com:192.168.4.1:120
 +usa-ns2.usa.example.com:192.168.4.2:120
+3ipv6.example.com:200106a80000000102104bfffe4b4c61:120
+:_imap._tcp.example.com:33:\000\000\000\001\000\217\004blah\004test\003com\000:120
 :dsdelegation.example.com:43:m\341\010\001\312\361\352\256\315\253\347afpx\217\220\042EK\365\375\237\332:120
 :escapedtext.example.com:16:\005begin\022the\040\042middle\042\040p\134art\007the\040end:120
 :google-alias.example.com:65401:\023google-public-dns-a\006google\003com\000:120
 :hightype.example.com:65534:\007\355\046\000\001:120
 :host-0.example.com:108:\000PV\233\000\347:120
 :host-1.example.com:109:\000PV\233\000\347\176W:120
-:hostmaster.mb.example.com:8:\004phil\303\177:120
-:hostmaster.mb.example.com:8:\006sheila\303\177:120
+:hostmaster.mb.example.com:8:\004phil\303\231:120
+:hostmaster.mb.example.com:8:\006sheila\303\231:120
 :hwinfo.example.com:13:\003abc\003def:120
-:ipv6.example.com:28:\040\001\006\250\000\000\000\001\002\020K\377\376KLa:120
 :location.example.com:29:\0002\026\023\213\044\323e\176\273\347\100\000\230\230\020:120
 :location.example.com:29:\000B\026\023t\333\053\274\176\273\347\100\000\230\230\020:120
 :location.example.com:29:\000\022\026\023\213\044\310\373\201D\030\300\000\230\230\020:120
 :location.example.com:29:\000\042\026\023t\3331\320\201D\030\300\000\230\230\020:120
 :multitext.example.com:16:\015text\040part\040one\015text\040part\040two\017text\040part\040three:120
-:phil.mb.example.com:7:\002pc\303\177:120
-:philip.mb.example.com:9:\303\216:120
-:sheila.mb.example.com:7:\004bill\303\177:120
+:phil.mb.example.com:7:\002pc\303\231:120
+:philip.mb.example.com:9:\303\250:120
+:sheila.mb.example.com:7:\004bill\303\231:120
 :text.example.com:16:\025Hi\054\040this\040is\040some\040text:120
 :text0.example.com:16:\014k\075rsa\073\040p\075one:120
 :text1.example.com:16:\014k\075rsa\073\040p\075one:120

diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index e2bf2c3e586eccfb4a193fe5470ee76200d5e45c..c41b7e6a89fc684dd5ec66b549a4b5d9de19c92e 100644 (file)
Binary files a/modules/tinydnsbackend/data.cdb and b/modules/tinydnsbackend/data.cdb differ

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index 215d8240d0afdee36f72019ba3cab77b6214c339..bace48899d468cad6c8406727fb517903b629fe3 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,4 +1,4 @@
-9f88091d3d1b793bf15a2cf5015bf92d  ../regression-tests/zones/example.com
+16f36b572fcb576e465f061e417626f8  ../regression-tests/zones/example.com
 fe49d2784b1bcc3b91ddd5619f0b6cc1  ../regression-tests/zones/test.com
 f0df67fa656d33fd85098cbe43893395  ../regression-tests/zones/test.dyndns
 dee3e8b568549d9450134b555ca73990  ../regression-tests/zones/sub.test.dyndns
@@ -12,4 +12,4 @@ a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/zones/secure-delegated.dns
 b1f775045fa2cf0a3b91aa834af06e49  ../regression-tests/zones/stest.com
 a98864b315f16bcf49ce577426063c42  ../regression-tests/zones/cdnskey-cds-test.com
 9aeed2c26d0c3ba3baf22dfa9568c451  ../regression-tests/zones/2.0.192.in-addr.arpa
-7145702efe04410a480114206dea2da6  ../modules/tinydnsbackend/data.cdb
+dcf9536d23ecffbdb706aa7d95bfb725  ../modules/tinydnsbackend/data.cdb

diff --git a/regression-tests/tests/any-nxdomain/expected_result.dnssec b/regression-tests/tests/any-nxdomain/expected_result.dnssec
index ea3fe0980685b5a8d6f67b3102f840c77eaec744..5775bc95ccbe099f48797ce9525f80e354f92a2d 100644 (file)
--- a/regression-tests/tests/any-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/any-nxdomain/expected_result.dnssec
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
index f0c08b3c21012bb7e008e74f5753b47f0b77e87d..44341762a6b3b174b926e5183f0bb04359b4d10a 100644 (file)
--- a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec
@@ -1,6 +1,6 @@
 0      nxd.example.com.        IN      CNAME   120     nxdomain.example.com.
 0      nxd.example.com.        IN      RRSIG   120     CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ...
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
index 15ec6c7ed8ebd9add164677e7aaf0dd25b33c8c4..fa82444fdf4a987b70040a9989279df7633be120 100644 (file)
--- a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
+++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
index 503c1dd715b0e17df0af812c9e760e89f8e4ebbe..f668ae2542aeabfc1f8e77f30128f3a0bbd9191d 100644 (file)
--- a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
+++ b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/no-out-of-zone-data/command b/regression-tests/tests/no-out-of-zone-data/command
new file mode 100755 (executable)
index 0000000..bbf8ccd
--- /dev/null
+++ b/regression-tests/tests/no-out-of-zone-data/command
@@ -0,0 +1,2 @@
+#!/bin/sh
+cleandig _imap._tcp.example.com SRV

diff --git a/regression-tests/tests/no-out-of-zone-data/description b/regression-tests/tests/no-out-of-zone-data/description
new file mode 100644 (file)
index 0000000..04e360d
--- /dev/null
+++ b/regression-tests/tests/no-out-of-zone-data/description
@@ -0,0 +1,2 @@
+Ensure that we don't send out of zone data in the additional section when processing
+e.g. SRV, MX and NS records

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

diff --git a/regression-tests/tests/nsec-glue/expected_result b/regression-tests/tests/nsec-glue/expected_result
index 3bed7062b313c17fde9d11dec6185985f7869d92..f3879c9a188b9678d67bf080032772a252f1c08d 100644 (file)
--- a/regression-tests/tests/nsec-glue/expected_result
+++ b/regression-tests/tests/nsec-glue/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/nsec-middle/expected_result b/regression-tests/tests/nsec-middle/expected_result
index 2e36f4990609fdfac8054711c6e54900aafe1605..fb2388fde1c3357fc7e7773491ffdcf04d3b3216 100644 (file)
--- a/regression-tests/tests/nsec-middle/expected_result
+++ b/regression-tests/tests/nsec-middle/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/nsec-wraparound/expected_result b/regression-tests/tests/nsec-wraparound/expected_result
index c44ef36048848f9785a98a2bdcd49737ec1847d8..4d7890d937249399b0d2fbc1f7544cf8df9bda93 100644 (file)
--- a/regression-tests/tests/nsec-wraparound/expected_result
+++ b/regression-tests/tests/nsec-wraparound/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
index 7b5417d53de2045c73933b82a2150940db08be29..740a02be5bb47f2b47b4bbb82a080aa36f8e3ada 100644 (file)
--- a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
+++ b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
index 09452d5f5ce28d647ecaaefe8234cfc8760838af..8e50e4953392dfc26394d59a593e0aaf0799f362 100644 (file)
--- a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
+++ b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/space-name/expected_result b/regression-tests/tests/space-name/expected_result
index 3893e964c9b5cf900d92280d969bdd271a9cea1b..da87b5ffd155c1156c0a1d932648ad8539016a72 100644 (file)
--- a/regression-tests/tests/space-name/expected_result
+++ b/regression-tests/tests/space-name/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/tests/two-level-nxdomain/expected_result b/regression-tests/tests/two-level-nxdomain/expected_result
index fe36499ae33cc5151d4669fac42a86063d205e83..d8d21b05572e4cc79e6222144b1c434a1440a95b 100644 (file)
--- a/regression-tests/tests/two-level-nxdomain/expected_result
+++ b/regression-tests/tests/two-level-nxdomain/expected_result
@@ -1,4 +1,4 @@
-1      example.com.    IN      NSEC    86400   double.example.com. NS SOA MX RRSIG NSEC DNSKEY
+1      example.com.    IN      NSEC    86400   _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      example.com.    IN      RRSIG   86400   NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      RRSIG   86400   SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400

diff --git a/regression-tests/zones/example.com b/regression-tests/zones/example.com
index a7667c9ad2be372ffba79dbaa9d0df8340f4b4c1..d797d8440a22d22cf0ceaada24e4021c09ca37b7 100644 (file)
--- a/regression-tests/zones/example.com
+++ b/regression-tests/zones/example.com
@@ -20199,3 +20199,6 @@ sheila.mb          IN      MB      bill.mb.example.com.
 hostmaster.mb      IN      MG      phil.mb.example.com.
                    IN      MG      sheila.mb.example.com.
 philip.mb          IN      MR      phil.mb.example.com.
+
+; Test that no out of zone data is sent
+_imap._tcp IN SRV 0 1 143 blah.test.com.