From 99f29d7fb1014d461ec2edb5d7ab1ea13c65d0fb Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 22 Aug 2018 10:22:32 +0200 Subject: [PATCH] Add out-of-zone additional data test. --- .../apex-test/expected_result | 2 -- .../ns-at-delegation/expected_result | 2 -- modules/tinydnsbackend/data | 13 +++++++------ modules/tinydnsbackend/data.cdb | Bin 1352532 -> 1352616 bytes .../tinydns-data-check/expected_result | 4 ++-- .../tests/any-nxdomain/expected_result.dnssec | 2 +- .../cname-to-nxdomain/expected_result.dnssec | 2 +- .../expected_result.dnssec | 2 +- .../ds-at-apex-noerror/expected_result.dnssec | 2 +- .../tests/no-out-of-zone-data/command | 2 ++ .../tests/no-out-of-zone-data/description | 2 ++ .../tests/no-out-of-zone-data/expected_result | 3 +++ .../tests/nsec-glue/expected_result | 2 +- .../tests/nsec-middle/expected_result | 2 +- .../tests/nsec-wraparound/expected_result | 2 +- .../nsec-wrong-type-at-apex/expected_result | 2 +- .../nsec3-hash-query/expected_result.dnssec | 2 +- .../tests/space-name/expected_result | 2 +- .../tests/two-level-nxdomain/expected_result | 2 +- regression-tests/zones/example.com | 3 +++ 20 files changed, 30 insertions(+), 23 deletions(-) create mode 100755 regression-tests/tests/no-out-of-zone-data/command create mode 100644 regression-tests/tests/no-out-of-zone-data/description create mode 100644 regression-tests/tests/no-out-of-zone-data/expected_result diff --git a/modules/remotebackend/regression-tests/apex-test/expected_result b/modules/remotebackend/regression-tests/apex-test/expected_result index e8f5ca6aa9..fad2018733 100644 --- 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 e8f5ca6aa9..fad2018733 100644 --- 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 72c7a00632..bcbeb035f8 100644 --- 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 GIT binary patch delta 5026 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 delta 5018 zc-n1N30RcX8b0U$hZ%9{To3Ca5r)w8#}Dc99W|s2zjs`W3iqm2RQ?I5;yTY z$W;BZ<`1KJmexF|P|>8}i#+%mV|G^_oW!W>#e=Uf%75p*F=SK8mXE_fl z)qP)41&WXJ;0yKQla#5~L*u$jni4UaKw9$*Vox&{`WO-R6 z3Rt^QwDlB8@7;YwqJ+IK&9e=parifPL~4tjqGzENhW^g*L3B=+2_V z+&Pq3b{;L%Qb=vnR>?sa$vdc{p;RJ0&E887ug3CjZsRH=j;9W-EmERkoT)5*9$xVJ``FmeXV5uj}DJbm%@8WrXX{l_qYw4vs;C z9&@37>f^{qdzO9}*$yKf}_tlAhmETcGe8K=BbD7=O4_vOnWj6=Ko^CJS_8>smo{181; zmx>0Du9k-4a`>PiXhRc<_!vF&T_#H1&L1`~$xbwQ4?oS1xv>P5?&I?#U^a^VmUrQs zSEH-v`P6WzM~M&kM+*7t2;1cMHJyLMt@Fc@Swo4-i)W8}AC zd|-IcbzdN{6Sq#zl1R-SD?Nx35VZ-WvDqr_)9Msc5-0qy^6TkHJqyi=Ll)WA)ByyDTSS>Y|0U0 zIxfqn=FciNeV_Z*OVo}jpg2{-_2_PnkQ5lO3s1!~&!N~~)}m=e!r@@!xMB{>*nFz? zWz>0(5W|Mm;Ok~qJWgymJP^#R8QQa1wJ~-G z4`WLHtc+m>Voy@-iND@2ybOpPif-%{lZ^09WegI#u&&kGd)|*kv%uWmfbJa^Lky5b z&2{2U$W*OC_1}v65a>X6uZh(Vjz;@_5JxcG_7-tq+ox42Ew@k{x)o!q%=(olLx`QV zo%$Ozyz(jP=@qvbU@p3HTMX^MzOg~O`ER0Rf$a4xtyP(lRLsF-)T6zW#IU`e(5{G< zta|t!YVnd(qLz24yVS3bTIOu23&YlI(sswqkzR+)w}mKUuJo8?t5#~g+CNYFlM(LW zc|6*Dqo{2m#U1F_LTM5QJE7?1k`f$Hg2{Z{Dkb{CHdM7vI%kBv(53>Zq>WI!lmllz z-|#VG)qyj|a;N#BF%?og%g%bz#p6dMlOHTZcaKXW7~wh|sI%qu2SgXeT}o_?6dG`9 z9X0E7l=o|-QaDM8td$(Fr?RP5surf7yB_^m7u<3<@Xu5 z6YU-+D=lHDGAK!Y6h0-F1CJsOk8F1-7(7Zi)WN0N7!TpUBy;4!0dOhW^pPAC*t+2E znqY?k{O^yiQ)F4SPe-m&7N^SoO3_8GRg`b%ur;0g;c%ed*GXW3&z2#yJ?;m5R|iH8 zK25(CNxn`g^Dgz!10Oqe;_2w1=g;OQj(T(p0^j`~W2H)bNUzN&dtLH-8sE8d+=-6N zQ+rHiuXnQ zICu1FTvc#pjX8)bk1(vMvl+!vFQN8L5clc)gIqVw|Z^-U<;=~RE@D*>&5AX&7U(B(1*Bs{g zQcsV6&^^E(cdEq9^~NQ4zqKdulD}Bj8heuHVJbP0#4JH!K_fiyZ@e(wRS# z2V>5&-j=4k=J)(T7hXL(Jw=(AE{7{|M>&6`aHZ@Y_1|b{C#xeA^KL8~5xNH&H(Fd@FHt@bBv!9itwFYb53H^#@l+BEep_IVFA_~t*Y+jnkWMC(7WzaaIm1&Oq; z(|zsBk|RFDg4yn#|9R&B>1!8HZCNQ+`KK1cT#f8g|G*LJj~MX2Emz0>s{xDToH{Dk z^-O%Y{nrI;u!v>so~1Xm*T65=UPA|8m+osn{U%Eyo;~wo%u=>zAEjlN$<}Oe7?kkX?1h6@m~9h;lfQ;`DK~hu60vU<25VZGrk+z zdjOv=*?W!-!ev_jy`gC+qeNk?TTed!Tk@)B^cm#}A76`0jwpP5@MC<=N*Om5-bv*2k)@_z0 F=07u?;@toM diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result index 215d8240d0..bace48899d 100644 --- 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 ea3fe09806..5775bc95cc 100644 --- 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 f0c08b3c21..44341762a6 100644 --- 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 15ec6c7ed8..fa82444fdf 100644 --- 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 503c1dd715..f668ae2542 100644 --- 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 index 0000000000..bbf8ccd44d --- /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 index 0000000000..04e360d764 --- /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 index 0000000000..2266411381 --- /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 3bed7062b3..f3879c9a18 100644 --- 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 2e36f49906..fb2388fde1 100644 --- 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 c44ef36048..4d7890d937 100644 --- 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 7b5417d53d..740a02be5b 100644 --- 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 09452d5f5c..8e50e49533 100644 --- 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 3893e964c9..da87b5ffd1 100644 --- 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 fe36499ae3..d8d21b0557 100644 --- 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 a7667c9ad2..d797d8440a 100644 --- 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. -- 2.47.2