From 73ab8f5c767ca23a59585ea00bcb20eec2013135 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <cmouse@desteem.org>
Date: Tue, 31 Mar 2015 22:21:30 +0300
Subject: [PATCH] Update other tests to include ucr65226.test.com

---
 modules/tinydnsbackend/data                   |   1 +
 modules/tinydnsbackend/data.cdb               | Bin 1350898 -> 1350959 bytes
 .../tests/ent-axfr/expected_result            |   3 ++-
 .../tests/ent-axfr/expected_result.nsec3      |   3 ++-
 .../ent-axfr/expected_result.nsec3-optout     |   3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 0d053c237b..1be550ce3f 100644
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20170,6 +20170,7 @@ C\052.test.test.com:server1.test.com.:3600
 &sub.test.test.com::ns-test.example.net.test.com.:3600
 +www.test.test.com:4.3.2.1:3600
 Ctoroot.test.com:..:3600
+:urc65226.test.com:65226:ABC:3600
 :very-long-txt.test.com:16:\377A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\030\040won\047t\040believe\040how\040long\041:3600
 Cwithin-server.test.com:outpost.example.com.:3600
 Cwww.test.com:server1.test.com.:3600
diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index a558791d432b91537cbfbd42967217e747eeca39..3affd349bf8ba56372defb909f889a1a429f074e 100644
GIT binary patch
delta 3986
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
Sa$j;-vnlo`{(17KLH_~IKVkm>

delta 4009
zc-n1N2~-qE8m{gEhB=_St6LB;q6ASA#V|2z;(Cq{Jc!458&`d!Xe1ul@%9lXj(8DN
z9F;*p&=FC5c+I+YR75jTHqj0kBJl`nGRu0e(Q#L0CA!u1Pogi%d-cBgkE;5=ul}lL
z-w})du*L4&%^?Ru$h{ZP<KfT})jq_bEP~!69LiMfDh_?7qBnrmf%s_-?IOsY<xnZX
z*m@2XsrDrfZB_AVz~2aY)|=qB-lb?q)(0Hgs3tz<kdvUZnM3&mEeuZ=GKKIoUZ>|#
zuIlFkeu<}f{+2vCp<){zRT1>X@#wS~f0IWwYN1Iy@~XtT@#t$cuP6Ae$tv2(!UK8A
z*gKd<tJFe<^JuZU;V7Oe;u{CHX97=^a9Y8(PUWc*)(jpMs2k4aDMQ;_DA2MfQ0NjK
z6{`v?<EawnRp5_Z!=tTs^@o#3dFqCFJXOG2$fF#!pb}u{C<Qc^gA%?yJX))6;DL=}
zWgeYW<HtY=^H)4NLJ)rgOdYilch?7$_z~icpLt|g6a3eKS>5e`62Aa?9spCvBOc9H
znLOc9wrW3vxJ@I_xLGSuh9;vxnPCBJHUey4D}fg3i4iCfTbw|9z?LA`L8?T7GV_}R
zs)W0nKpEm5fQ~-kH>JP={sEBh91L-GxIme+V+G1IcA`KT`lkr!3w7fR@Yj7JPz8MR
z1yrdL&9p<J(;-ksjuiq`!kR76v$w4k=#j7+1hi0{kOy&hfdJiK4D&p00l8IsClu(Y
z5a?OE4}cQRLjtN$3pxt6?*u5|v!4q5I4#ibw$=hO_8cVoF91X9Wr+KJ1|^)=V4m|f
z<eTmZwEJTp0z*@?0Nu}GO3)UHY1|r)sS*we)41K=3R5ZS+G5JcABQO;Uq?(8@OJ`a
zlQ2Dd%R87Vf!~8XwkO1KUyRDsUU(nSHVD((;2DZ(p`MW#?N<x?5L0C=lQ7(WOFAT2
zGBB0eHw(}<2U96c3o%@uPcht*r5N6U6&QLZ8|M4h0W+KjOxYq#@4MNJ(FN5m2fu$W
zrV6ot$K;(L_s?<^r0{-;>3#N|0!DS;07LJ$0snUae?3Mk=nEH6<O<}OeVBGRz8+BG
z4u*SvAJg72Jp>y+!Dz2~1V}_h>ixF{i|{1sMVesdM5;iYDAISp)KY}5Zw>Lfb|O{6
z5iimQ%ln2%m9TaZ;cVX#DMRO<McVzAz9Ln^nF?{w2O?F%JzPX~HNiSoq)(=2q6qhW
zvIzHknn;<tKNisq^=ND&?SAik5foVrd7dSKc@8Mlyb_Sj0b=ZWDBQOR3Uw5KZ7mV)
z^lUAq;4qa#Lfsx%!08d`Sz{TLupI^Fu_r_-vE>xx`@exaTMaOGoCBurOQ3-DC&1Wi
zz#QL!xXEvafd7$5uZj0p5gk+~Xe7$itd;1kuo@(I4>*ZR?hzsGj0C?sTB1tT#YnWf
z{c#fQ1#f~x74RlXl%V@<iQWp|yAmj2?+FPGvqY7!rAqMNq)C*iXDImHBPGf(b{wF4
z0xV#jEP>P?!93>-i86H9Bvh@=UntR|W$h9r>dlg<LUq}Yr}O4YNTFY+Chf{5Ekg!N
zhK7tFGJ?qnAw!LYlA$9*PlkaEBN<_2gv(7@?o_sX+sWNaXV%CKkGaTTjejTS`m&0P
zlDVf`gON#;@96m<q3rDvxu?kIMYA{Z<oZN@Z-n7+9*1HEB$sxW65{%j6B1-Og>N0k
zM9SwZd~Jv>r;tOhe_piQD_4x=yK$PY3piK1IAN6QY!zpaQ>XKlZ!=YL&=$Tnky$FA
zJHsz%!^F#JxA@~i-_Bb(l+uuvza>J4QjUGM;aF1`O3~IAJ5)cx3EK(!wf=R74Aj1`
z9sGPLV7e=<nU7(P$TOPx1w7MQZZrz}GMRz$#?`{J5Ik}hhbG@WF?3%58+W;O<O(Zv
z12z-;$4pI$tLu89L&B+mc|*mfpEmF640coj;OGEukh9hc-J*2jHV#eSc2*fIpWH2U
z&_qR*b137))AV^m3@GEwpg(=0+63Kl&|YD*j%g>4mxU4y>o1glJtAD0t<i7cKuPVJ
z*!Y^^f}2CDzfVe?u`}RK?T^QY>Y@qR>`e=X?Q>NO#mCtvo8+0pa4$16M6TF?he%0F
zH*%=(z~eqw0w``Gm{~mI-ydkH-CwmQ+`sqiGNQIa?z9VQqYb`%@}FJ#k*e)2bkG2!
zzrqa>j85))2}cGc{f)3IE3eLsa04z<v1RVHo3-K8zPbba)5-wL<jgC0r<SRd<F4Vz
zc+HA@$|6agZ4|Qv&7pkSX6@w2He%OMCPYq)7oVA5e@Ha-jwt#*WRxEL_U9cp;oAEy
z;(u>Z{9QhrPIIlBE*kZ#iimg20DP%P-Z5QFWZAo0<ob`rc&*T53x~e?^<VCd0X!-j
z=ZM!^>&}x7I^8m}J(io-iP0gEN{cgFV=MJYxl;D}tyae0wsfs^iS6u4pM=kS|6zVF
zL>c&xF>mFEqd)#BH@kd$=%@xMHO98xZAPR-IjW>V-1GSA`BSEh&>>}B`+jK$3@^`b
z%Ftg3eNI?;GA1Fnvw<G^G-Xl4q|&FMNLka_Q86Oyc~XB@^{NA8(VJ&O`kW*v%o#9a
zwgD;6xYWk0uPCzSbcJIU$y+uu{NT<or2Me>L%bv$DeD_cavtmHk=vCPZ%li?J4s?L
zrc_oxuT-ftXXn(i&+V$W$_uo*mp4ftpiIgOB1*-_v>rp0*i?8dYtjo!1m{j((MZTd
z{hZaYH7O#xcKc6#elNBoktj>ozYRGL@Ac};o5q(n*lhW+VUICT?Q8jN_Bu({r7m4K
zhpc9JXY1pO1W)ci^|+d_NWT@l|02Qa;zsLKlD8(Oe?u0LsC-S!h09+d(X&}$amQYe
z_<nPZ{;$DAs*CNO_I#<BwnV#rQ!6`?4L<cJcWQV+u6M_;UfUbFdgY6)Mh#tk!!(@e
z+&<(=)dnI-b?-Lw%U;23X}Ptzj!3iVf6MZd!d{Nw-x3;>OZMu;RNr}Oq<5){viZQa
zdrJtj<&!?UvFa6*bY-bI$%L`_i+?I^J)M-Q%#5fxI4Fd)Wn^)mAIN0OgSK-!J+DX!
z`%C)3{iKp6Lvlmm3#<;#TlH=$hOixG==ua6i4MxPn9E%qgjU9riMcmlQGp;W>(M)m
zCUeS6Svz+J;ZXDOHS>DCYe}A%ARjLflT8T=iaB)t%<{GCXN98knf131-(}GGk3x4{
zR{aDGC4gyir*FmMy_qrc9iz08W#-9qIjLI^)7@1eN*$P)@;OmjX%NnlxAuDB+0;(E
z0Vm2cVx*nz4QXV#U(&Cx?)6{2`Zek+PfU>x25H6>1wMLR21=#DhHUbd-Jh2@HP06U
z?ngtUG?sivk}Z-ef*I#(_(*ybRZ8BZN6}TomNtZ;N8^vh*Qqu^B;T1X^?UpOiRDiw

diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result
index 54d8943fa1..f24685c759 100644
--- a/regression-tests/tests/ent-axfr/expected_result
+++ b/regression-tests/tests/ent-axfr/expected_result
@@ -16,7 +16,8 @@ ns2.test.com.	86400	IN	NSEC	server1.test.com. A RRSIG NSEC
 server1.test.com.	86400	IN	NSEC	*.test.test.com. A RP RRSIG NSEC
 sub.test.test.com.	86400	IN	NSEC	www.test.test.com. NS RRSIG NSEC
 test.com.	86400	IN	NSEC	_underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
-toroot.test.com.	86400	IN	NSEC	very-long-txt.test.com. CNAME RRSIG NSEC
+toroot.test.com.	86400	IN	NSEC	urc65226.test.com. CNAME RRSIG NSEC
+urc65226.test.com.	86400	IN	NSEC	very-long-txt.test.com. RRSIG NSEC TYPE65226
 very-long-txt.test.com.	86400	IN	NSEC	within-server.test.com. TXT RRSIG NSEC
 within-server.test.com.	86400	IN	NSEC	www.test.com. CNAME RRSIG NSEC
 www.test.com.	86400	IN	NSEC	test.com. CNAME RRSIG NSEC
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3
index 7e04311cc2..10c1729790 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3
@@ -2,7 +2,8 @@
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	86400	IN	NSEC3	1 0 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	86400	IN	NSEC3	1 0 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG
 4ul8f3m96vconea85u93dh9sg570j4fu.test.com.	86400	IN	NSEC3	1 0 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG
-53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG
+53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 0 1 abcd 53LJH1SKI76U8MVC0TPOA423TDUR0KL8 SRV RRSIG
+53ljh1ski76u8mvc0tpoa423tdur0kl8.test.com.	86400	IN	NSEC3	1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V RRSIG TYPE65226
 79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com.	86400	IN	NSEC3	1 0 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG
 79u3das6ucctns1br3tvd8qkanni351l.test.com.	86400	IN	NSEC3	1 0 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99
 7mmura8h40be5n4koan7rnmkursamh99.test.com.	86400	IN	NSEC3	1 0 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
index dd5f317073..e83ea26554 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
@@ -2,7 +2,8 @@
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	86400	IN	NSEC3	1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	86400	IN	NSEC3	1 1 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG
 4ul8f3m96vconea85u93dh9sg570j4fu.test.com.	86400	IN	NSEC3	1 1 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG
-53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG
+53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 1 1 abcd 53LJH1SKI76U8MVC0TPOA423TDUR0KL8 SRV RRSIG
+53ljh1ski76u8mvc0tpoa423tdur0kl8.test.com.	86400	IN	NSEC3	1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V RRSIG TYPE65226
 79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com.	86400	IN	NSEC3	1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG
 79u3das6ucctns1br3tvd8qkanni351l.test.com.	86400	IN	NSEC3	1 1 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99
 7mmura8h40be5n4koan7rnmkursamh99.test.com.	86400	IN	NSEC3	1 1 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6
-- 
2.47.2