From d959e0bb87a4198845f052456e273db68fa0286e Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Fri, 24 Jan 2025 09:40:23 +0100 Subject: [PATCH] Add a flags "s" NAPTR test to exercize previous commit. --- modules/tinydnsbackend/data | 3 ++- modules/tinydnsbackend/data.cdb | Bin 1356573 -> 1356657 bytes .../tests/ent-axfr/expected_result | 3 ++- regression-tests/tests/naptr/command | 2 +- regression-tests/tests/naptr/expected_result | 6 +++++- regression-tests/zones/test.com | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 06c8f6161170..67c09c9d79b7 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20190,7 +20190,8 @@ Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:8640 :_underscore.test.com:16:\030underscores\040are\040terrible:3600 :aland.test.com:16:\016\303\205LAND\040ISLANDS:3600 :d.test.com:39:\002d2\005test2\003com\000:3600 -:enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\010testuser\006domain\003com\000:3600 +:ensm.test.com:35:\000d\0002\001s\007e2u\053sip\000\007server1\004test\003com\000:3600 +:enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\007server1\004test\003com\000:3600 :hightxt.test.com:16:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600 :hightxt.test.com:99:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600 :interrupted-rrset.test.com:16:\023check\040AXFR\040signpipe:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index 98225edd8ca8b4720e734abe1417e0dab172b592..827c3ddc571ddd4a71d13b359a86058947a3ac89 100644 GIT binary patch delta 4367 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 delta 4374 zcmZuz3tW>`8$a)cjBRZ1HDT!_Zy?eVyy0g}#Z1yfG|Ti;R8sI#V0qV=Q?t*qrj_Xo z9ikzLHSo$2WQzAh=M51}Ct7b|InJUig`Z;40tL?o@O;33iA9@;-G7xuc?8YZ zShQB**IAUS;H`lD9*YVIcQk_CfjDKJ9eJB^=quvL&~Yf6pq1s&YGtCx(S>~B;J2AM z^d+$y+JL<-65`x394aSvcU%DDIaHy{w{qwN!Hj+!+E36nkV8KZ^b7&J6L zX6#7i&@yFW8i(c)^iJkz#@-CzuJ<{rgl#79q`5H9YJ-Ct7SW7Q(h@kJ zu!^G!S=I#Xxx`NPM~00YTBV$<05VJ}gPp zjXYXP&>?`|)*Spv&+;fo@kj8qWaf6j4bi~sEP&q5JT0vwo~Md9UgGU^LPi2ld%)12 z2PFpb=yPSkWS*A9Jq+wABVYk@3dDO-!EZ_DX%AT5<*5=$(|B~4%(ud~aG)I}R8T^()p5Bh6Z7|PT z%%cs8e>WV^P|icG4}lWq3Ld)uByihVP{3xt5cqN#GWP!jnYyn*pz8)?Xt)i2$6fGS zAHqEABT&Mp7SJAY0Iyb{8Twd(c7IZHfo5uHDS$$41W>30`0bt-Ai&jCfcxGjADA)tJ60K-24tz!lHF4!grwAQxC0@_0S{!Fl2 zXHdHxS?3BM-F$&c?OOzxu|%NFV);y<&1L>VpuOQ;DbU_X$`)wP)aAeib>9f+xKe`6 zpoDdcK<~S)SU~5A-Rc3m<%X!EM+Ym*t}k(wKwNOV*br=P*=s5)o zWK@Z?*<3#YPpSdMd_P0xb-zKThFhS3_b#BLQKUWLWhDAO_%(KkO5`y}^c`@B652sB zwU{KDslhDKTVZJ}(TpwaB`SGFH29M&z#VZC?F~;iiQao(Pl=Yu-CLpxxcf=87aRj5 zdMmtxC0a6@eHaATMo3WG6bW9!w;{lj4tDoD5>>+T9-w;$#3jv@Xm1$iOSETPizKM+ z$B?0SnM6x#UI_`-WlOX-{J9c+FSK>}5?q@PA83|5&@g1E$WW6JL`E|*g2_;PA!KOD z(2=1hBa{pS8Akj-!^SUXx;W=J*;p=QM%wflGpDCb3!X4FBXx2n-sxnY>&v`{&s|_A zn$^bDtn+jkYr-QN*q4HtO?Z``tq$(8b`y)(C5@)@-xG9)UcX+erM#t^@TjJCyK{|{ zuTl8c34LRJ3V~%xf;dSlY{D$!SL9VM+y&?>b=DZT=1hw7o`HMB^uqUy++Ie_Z3}FE zn&U2oGDC5pnTuC3lW=VW7ZuEO!^TMN+ZK!-7bkE<&GiLqSrjp#U!G%pu(DY+{(1!0 zPp9tbqN_w>?Rc&wV=CFrqSjSkPZDk#QS1B5XFgOo!5G|Y0v8|5EXK2@a7EFotGjU2 zSKQ?ms*2TEvxU2-V?M=ArJSans(drn)NqlpjNp8M<-?*Ue#@d)G*vl4g#_c%H*RCm`15hcr%M8uRnFX4Nl*~N2yJF$u3jMo6;^0)}txMUh95a;RM^_{C#|)mT8XbEBH=o z#)?~=;I9o}#^K;_0Y|FkZvwLZ)=LOA>l4VbpH#*rzP2@Bjvg(H4$xHnO&NZaj^9v4V^(_FL{T;#Z&uf!U z8maxGEnxpOfTy=&_75Rn!z{wZ4~3ex%(Hk^D=|@}F34e>`wnn%m~SnH@~R6tIHI$d zsZu}xB+0H~SGE3oaw~SaTV0PT4dl-B5J#(3r?c_c7sYgqs$nNS(pSvv$xO!GZDJ>t zdIyxEHU7jd<}s#fQuzb^UpDCS0apaD6!%{!PF3lDCb#dv;hqaS?+UDc;X|=sb9F9k z*BU2ei?U8vNwTd7&uU*=h&yc*&uR6p)hs%G+Z8fpIn^*4|D#CEis>k1v#6@1V*AYd z466F^EZ1-_7*&6J?E9kKSJcrfVYGID3Cb5jRao(MwKlR`H6 z6;5y?*|oZQ^R;ioG?bqsT2~+YXjwx>2<6krgH!EtRgL1*N+Db0xGQ4IRvmN6CYSoG zoxG_c2wf^ni@Bh1f+-sSR|W9o20Xh-JQvBVb`EYY#c1Sx?~a-tt#_u@2?@@G4w9+W zp|*4RD@O98^4}kMT-eKPwHhZEC7GO8%2>`WH+6ev{80mv_xe;Z$23Tux_;mXi;YMw zn9$O0(;_*+I;SX`@GVDdvz#oFFU9sP3J;-tKjDA>$hqns6Wt`<^sw>8S$ZVTOO|SM z|K}v0;j`m*8lBfgmDBbmyg}9vR)-Z`*AiJKc46ZehT`&Q z$*bXy7PF|kI44fps}|<%V9~WTrxM)(ys`sN?IsO>miZ7LPL{^%^^?dm zb2F{xle|B5^giMDM@a`&>Rly)S7zuKX|#&zgA2z=iOuxIMJ&2K^M&+(U!_0RCTvQV v2C0~@aQY<4*_^RCo90UmrXwyEHMH0>^x8!OY8dT_ysL16ZLx8IG``DU?_dm^ diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result index 6421d01dbea0..8eac145712fd 100644 --- a/regression-tests/tests/ent-axfr/expected_result +++ b/regression-tests/tests/ent-axfr/expected_result @@ -5,13 +5,14 @@ 15.order.test.com. 3600 IN NSEC server1.test.com. A RRSIG NSEC _double._tcp.dc.test.com. 3600 IN NSEC _ldap._tcp.dc.test.com. SRV RRSIG NSEC _ldap._tcp.dc.test.com. 3600 IN NSEC _root._tcp.dc.test.com. SRV RRSIG NSEC -_root._tcp.dc.test.com. 3600 IN NSEC enum.test.com. SRV RRSIG NSEC +_root._tcp.dc.test.com. 3600 IN NSEC ensm.test.com. SRV RRSIG NSEC _underscore.test.com. 3600 IN NSEC aland.test.com. TXT RRSIG NSEC aland.test.com. 3600 IN NSEC blah.test.com. TXT RRSIG NSEC b.c.test.com. 3600 IN NSEC *.a.b.c.test.com. A RRSIG NSEC blah.test.com. 3600 IN NSEC b.c.test.com. NS RRSIG NSEC counter.test.com. 3600 IN NSEC d.test.com. A RRSIG NSEC d.test.com. 3600 IN NSEC _double._tcp.dc.test.com. DNAME RRSIG NSEC +ensm.test.com. 3600 IN NSEC enum.test.com. NAPTR RRSIG NSEC enum.test.com. 3600 IN NSEC hightxt.test.com. NAPTR RRSIG NSEC hightxt.test.com. 3600 IN NSEC interrupted-rrset.test.com. TXT RRSIG NSEC SPF interrupted-rrset.test.com. 3600 IN NSEC ns1.test.com. A TXT RRSIG NSEC diff --git a/regression-tests/tests/naptr/command b/regression-tests/tests/naptr/command index 1a367cfaf424..bcd97fc01916 100755 --- a/regression-tests/tests/naptr/command +++ b/regression-tests/tests/naptr/command @@ -1,3 +1,3 @@ #!/bin/sh cleandig enum.test.com NAPTR - +cleandig ensm.test.com NAPTR diff --git a/regression-tests/tests/naptr/expected_result b/regression-tests/tests/naptr/expected_result index 4a4aa625613d..19641d136a2a 100644 --- a/regression-tests/tests/naptr/expected_result +++ b/regression-tests/tests/naptr/expected_result @@ -1,3 +1,7 @@ -0 enum.test.com. 3600 IN NAPTR 100 50 "u" "e2u+sip" "" testuser.domain.com. +0 enum.test.com. 3600 IN NAPTR 100 50 "u" "e2u+sip" "" server1.test.com. Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='enum.test.com.', qtype=NAPTR +0 ensm.test.com. 3600 IN NAPTR 100 50 "s" "e2u+sip" "" server1.test.com. +2 server1.test.com. 3600 IN A 1.2.3.4 +Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ensm.test.com.', qtype=NAPTR diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com index f3adcb1fe7ed..6d8a1c05455c 100644 --- a/regression-tests/zones/test.com +++ b/regression-tests/zones/test.com @@ -20,7 +20,8 @@ server1 IN A 1.2.3.4 *.test IN CNAME server1 www.test IN A 4.3.2.1 sub.test IN NS ns-test.example.net -enum IN NAPTR 100 50 "u" "e2u+sip" "" testuser.domain.com. +enum IN NAPTR 100 50 "u" "e2u+sip" "" server1.test.com. +ensm IN NAPTR 100 50 "s" "e2u+sip" "" server1.test.com. counter IN A 1.1.1.5 _ldap._tcp.dc IN SRV 0 100 389 server2.example.net. _double._tcp.dc IN SRV 0 100 389 server1