sort tinydns data to reduce size of future diffs

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 9715c9a12ec50ad8db85649018d4b5b0024e4259..401f7ebb3bf8383b3f7faa00e4378770311df7a1 100644 (file)
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -1,23 +1,18 @@
 #2847484148 auto axfr-get
-Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:86400:100000
+&dsdelegation.example.com::ns.example.com.:120
 &example.com::ns1.example.com.:120
 &example.com::ns2.example.com.:120
-@example.com::smtp-servers.example.com.:10:120
-@example.com::smtp-servers.test.com.:15:120
-+double.example.com:192.168.5.1:120
-&dsdelegation.example.com::ns.example.com.: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
-Cexternal.example.com:somewhere.else.net.:120
-@external-mail.example.com::server1.test.com.:25:120
 &france.example.com::ns1.otherprovider.net.:120
 &france.example.com::ns2.otherprovider.net.:120
+&italy.example.com::italy-ns1.example.com.:120
+&italy.example.com::italy-ns2.example.com.:120
+&usa.example.com::usa-ns1.usa.example.com.:120
+&usa.example.com::usa-ns2.usa.example.com.:120
++\052.w5.example.com:1.2.3.5:120
++double.example.com:192.168.5.1:120
 +hightype.example.com:192.168.1.5:120
-:hightype.example.com:65534:\007\355\046\000\001:120
 +host-0.example.com:192.168.1.0:120
-:host-0.example.com:108:\000PV\233\000\347:120
 +host-1.example.com:192.168.1.1:120
-:host-1.example.com:109:\000PV\233\000\347\176W:120
 +host-10.example.com:192.168.1.10:120
 +host-100.example.com:192.168.1.100:120
 +host-1000.example.com:192.168.1.232:120
@@ -20016,47 +20011,17 @@ Cexternal.example.com:somewhere.else.net.:120
 +host-9997.example.com:192.168.1.13:120
 +host-9998.example.com:192.168.1.14:120
 +host-9999.example.com:192.168.1.15: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
-&italy.example.com::italy-ns1.example.com.:120
-&italy.example.com::italy-ns2.example.com.:120
++host.\052.sub.example.com:192.168.6.1:120
 +italy-ns1.example.com:192.168.5.1:120
 +italy-ns2.example.com:192.168.5.2:120
 +localhost.example.com:127.0.0.1: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
-: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
-Cloop1.example.com:loop2.example.com.:120
-Cloop2.example.com:loop3.example.com.:120
-Cloop3.example.com:loop1.example.com.:120
-@mail.example.com::smtp1.example.com.:25:120
-:multitext.example.com:16:\015text\040part\040one\015text\040part\040two\017text\040part\040three:120
 +ns1.example.com:192.168.1.1:120
 +ns2.example.com:192.168.1.2:120
-Cnxd.example.com:nxdomain.example.com.:120
 +outpost.example.com:192.168.2.1:120
-Crhs-at-expansion.example.com:example.com.:120
-Csemi-external.example.com:bla.something.wtest.com.:120
-Cserver1.example.com:server1.france.example.com.:120
 +smtp-servers.example.com:192.168.0.2:120
 +smtp-servers.example.com:192.168.0.3:120
 +smtp-servers.example.com:192.168.0.4:120
-Csmtp1.example.com:outpost.example.com.:120
-Cstart.example.com:x.y.z.w1.example.com.:120
-Cstart1.example.com:start2.example.com.:120
-Cstart2.example.com:start3.example.com.:120
-Cstart3.example.com:start4.example.com.:120
 +start4.example.com:192.168.2.2:120
-+host.\052.sub.example.com:192.168.6.1: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
-:text2.example.com:16:\015k\075rsa\134\073\040p\075one:120
-:text3.example.com:16:\015k\075rsa\134\073\040p\075one:120
-@together-too-much.example.com::toomuchinfo-a.example.com.:25:120
-@together-too-much.example.com::toomuchinfo-b.example.com.:25:120
-+toomuchinfo-a.example.com:192.168.99.1:120
 +toomuchinfo-a.example.com:192.168.99.10:120
 +toomuchinfo-a.example.com:192.168.99.11:120
 +toomuchinfo-a.example.com:192.168.99.12:120
@@ -20067,13 +20032,14 @@ Cstart3.example.com:start4.example.com.:120
 +toomuchinfo-a.example.com:192.168.99.17:120
 +toomuchinfo-a.example.com:192.168.99.18:120
 +toomuchinfo-a.example.com:192.168.99.19:120
-+toomuchinfo-a.example.com:192.168.99.2:120
++toomuchinfo-a.example.com:192.168.99.1:120
 +toomuchinfo-a.example.com:192.168.99.20:120
 +toomuchinfo-a.example.com:192.168.99.21:120
 +toomuchinfo-a.example.com:192.168.99.22:120
 +toomuchinfo-a.example.com:192.168.99.23:120
 +toomuchinfo-a.example.com:192.168.99.24:120
 +toomuchinfo-a.example.com:192.168.99.25:120
++toomuchinfo-a.example.com:192.168.99.2:120
 +toomuchinfo-a.example.com:192.168.99.3:120
 +toomuchinfo-a.example.com:192.168.99.4:120
 +toomuchinfo-a.example.com:192.168.99.5:120
@@ -20131,61 +20097,91 @@ Cstart3.example.com:start4.example.com.:120
 +toomuchinfo-b.example.com:192.168.99.88:120
 +toomuchinfo-b.example.com:192.168.99.89:120
 +toomuchinfo-b.example.com:192.168.99.90:120
-Cunauth.example.com:no-idea.example.org.:120
-&usa.example.com::usa-ns1.usa.example.com.:120
-&usa.example.com::usa-ns2.usa.example.com.:120
 +usa-ns1.usa.example.com:192.168.4.1:120
 +usa-ns2.usa.example.com:192.168.4.2: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\300\024: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
+: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
+: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
+:text2.example.com:16:\015k\075rsa\134\073\040p\075one:120
+:text3.example.com:16:\015k\075rsa\134\073\040p\075one:120
+@example.com::smtp-servers.example.com.:10:120
+@example.com::smtp-servers.test.com.:15:120
+@external-mail.example.com::server1.test.com.:25:120
+@mail.example.com::smtp1.example.com.:25:120
+@together-too-much.example.com::toomuchinfo-a.example.com.:25:120
+@together-too-much.example.com::toomuchinfo-b.example.com.:25:120
 C\052.w1.example.com:x.y.z.w2.example.com.:120
 C\052.w2.example.com:x.y.z.w3.example.com.:120
 C\052.w3.example.com:x.y.z.w4.example.com.:120
 C\052.w4.example.com:x.y.z.w5.example.com.:120
-+\052.w5.example.com:1.2.3.5:120
+Cexternal.example.com:somewhere.else.net.:120
+Cloop1.example.com:loop2.example.com.:120
+Cloop2.example.com:loop3.example.com.:120
+Cloop3.example.com:loop1.example.com.:120
+Cnxd.example.com:nxdomain.example.com.:120
+Crhs-at-expansion.example.com:example.com.:120
+Csemi-external.example.com:bla.something.wtest.com.:120
+Cserver1.example.com:server1.france.example.com.:120
+Csmtp1.example.com:outpost.example.com.:120
+Cstart.example.com:x.y.z.w1.example.com.:120
+Cstart1.example.com:start2.example.com.:120
+Cstart2.example.com:start3.example.com.:120
+Cstart3.example.com:start4.example.com.:120
+Cunauth.example.com:no-idea.example.org.:120
 Cwww.example.com:outpost.example.com.:120
+Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:86400:100000
 #2005092501 auto axfr-get
-Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
+&blah.test.com::blah.test.com.:3600
+&sub.test.test.com::ns-test.example.net.test.com.:3600
 &test.com::ns1.test.com.:3600
 &test.com::ns2.test.com.:3600
-@test.com::..:10:3600
-@test.com::smtp-servers.test.com.:15:3600
-:_underscore.test.com:16:\030underscores\040are\040terrible:3600
-:aland.test.com:16:\016\303\205LAND\040ISLANDS:3600
-&blah.test.com::blah.test.com.:3600
-+blah.test.com:192.168.6.1:3600
-+b.c.test.com:5.6.7.8:3600
 +\052.a.b.c.test.com:8.7.6.5:3600
++b.c.test.com:5.6.7.8:3600
++blah.test.com:192.168.6.1:3600
 +counter.test.com:1.1.1.5:3600
-:d.test.com:39:\002d2\005test2\003com\000:3600
++ns1.test.com:1.1.1.1:3600
++ns2.test.com:2.2.2.2:3600
++server1.test.com:1.2.3.4:3600
++www.test.test.com:4.3.2.1:3600
 :_double._tcp.dc.test.com:33:\000\000\000d\001\205\007server1\004test\003com\000:3600
 :_double._tcp.dc.test.com:33:\000\001\000d\001\205\007server1\004test\003com\000:3600
 :_ldap._tcp.dc.test.com:33:\000\000\000d\001\205\007server2\007example\003net\000:3600
 :_root._tcp.dc.test.com:33:\000\000\000\000\000\000\000:3600
+:_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
 :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
-+ns1.test.com:1.1.1.1:3600
-+ns2.test.com:2.2.2.2:3600
-+server1.test.com:1.2.3.4:3600
 :server1.test.com:17:\003ahu\004ds9a\002nl\000\007counter\004test\003com\000:3600
-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
+@test.com::..:10:3600
+@test.com::smtp-servers.test.com.:15:3600
+C\052.test.test.com:server1.test.com.:3600
+Ctoroot.test.com:..:3600
 Cwithin-server.test.com:outpost.example.com.:3600
 Cwww.test.com:server1.test.com.:3600
+Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2012060701 auto axfr-get
-Ztest.dyndns:ns1.test.dyndns.:ahu.example.dyndns.:2012060701:28800:7200:604800:86400:3600
 &test.dyndns::ns1.test.dyndns.:3600
 &test.dyndns::ns2.test.dyndns.:3600
-@test.dyndns::host-1.test.dyndns.:10:3600
-@test.dyndns::host-2.test.dyndns.:20:3600
-Ccname1.test.dyndns:host-1.test.dyndns.:3600
-Ccname2.test.dyndns:host-2.test.dyndns.:3600
-+delete-add.test.dyndns:127.0.0.108:3600
-:delete-add.test.dyndns:16:\034Should\040be\040gone\040after\040a\040while:3600
++\052.wild.test.dyndns:127.0.1.255:3600
 +a.host.test.dyndns:1.1.1.1:3600
++delete-add.test.dyndns:127.0.0.108:3600
 +e.host.test.dyndns:1.1.1.1:3600
 +host-1.test.dyndns:127.0.0.101:3600
 +host-2.test.dyndns:127.0.0.102:3600
@@ -20197,86 +20193,91 @@ Ccname2.test.dyndns:host-2.test.dyndns.:3600
 +ns2.test.dyndns:127.0.0.2:3600
 +replace.test.dyndns:127.0.0.1:3600
 +ttl.test.dyndns:127.0.0.1:3600
+:delete-add.test.dyndns:16:\034Should\040be\040gone\040after\040a\040while:3600
 :txt.test.dyndns:16:\021This\040is\040some\040text:3600
-+\052.wild.test.dyndns:127.0.1.255:3600
+@test.dyndns::host-1.test.dyndns.:10:3600
+@test.dyndns::host-2.test.dyndns.:20:3600
+Ccname1.test.dyndns:host-1.test.dyndns.:3600
+Ccname2.test.dyndns:host-2.test.dyndns.:3600
+Ztest.dyndns:ns1.test.dyndns.:ahu.example.dyndns.:2012060701:28800:7200:604800:86400:3600
 #2005092501 auto axfr-get
-Zwtest.com:ns1.wtest.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &wtest.com::..:3600
 &wtest.com::ns1.wtest.com.:3600
-@wtest.com::smtp-servers.example.com.:10:3600
-@wtest.com::smtp-servers.wtest.com.:15:3600
-+wtest.com:9.9.9.9:3600
-C\052.wtest.com:server1.wtest.com.:3600
-:e.wtest.com:16:\011non-empty:3600
-:d.e.wtest.com:16:\011non-empty:3600
-:c.d.e.wtest.com:16:\011non-empty:3600
-:b.c.d.e.wtest.com:16:\011non-empty:3600
-:a.b.c.d.e.wtest.com:16:\011non-empty:3600
 +\052.a.b.c.d.e.wtest.com:6.7.8.9:3600
++\052.something.wtest.com:4.3.2.1:3600
++a.something.wtest.com:10.11.12.13:3600
 +ns1.wtest.com:2.3.4.5:3600
-@secure.wtest.com::server1.wtest.com.:10:3600
 +server1.wtest.com:1.2.3.4:3600
++wtest.com:9.9.9.9:3600
+:a.b.c.d.e.wtest.com:16:\011non-empty:3600
+:b.c.d.e.wtest.com:16:\011non-empty:3600
+:c.d.e.wtest.com:16:\011non-empty:3600
+:d.e.wtest.com:16:\011non-empty:3600
+:e.wtest.com:16:\011non-empty:3600
 :something.wtest.com:16:\045make\040the\040empty\040non-terminal\040non-empty:3600
-+\052.something.wtest.com:4.3.2.1:3600
-+a.something.wtest.com:10.11.12.13:3600
+@secure.wtest.com::server1.wtest.com.:10:3600
+@wtest.com::smtp-servers.example.com.:10:3600
+@wtest.com::smtp-servers.wtest.com.:15:3600
+C\052.wtest.com:server1.wtest.com.:3600
+Zwtest.com:ns1.wtest.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2005092501 auto axfr-get
-Znztest.com:ns1.nztest.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &nztest.com::ns1.nztest.com.:3600
 &nztest.com::ns2.nztest.com.:3600
-+nztest.com:127.0.0.1:3600
 +ns1.nztest.com:1.1.1.1:3600
 +ns2.nztest.com:2.2.2.2:3600
++nztest.com:127.0.0.1:3600
+Znztest.com:ns1.nztest.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2005092501 auto axfr-get
-Zdnssec-parent.com:ns1.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
+&delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600
+&delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600
 &dnssec-parent.com::ns1.dnssec-parent.com.:3600
 &dnssec-parent.com::ns2.dnssec-parent.com.:3600
-+dnssec-parent.com:9.9.9.9:3600
 &insecure-delegated.ent.ent.auth-ent.dnssec-parent.com::ns.example.com.:3600
-+something1.auth-ent.dnssec-parent.com:1.1.2.3:3600
-&delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600
-&delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600
-+ns1.delegated.dnssec-parent.com:4.5.6.7:3600
-+ns2.delegated.dnssec-parent.com:5.6.7.8:3600
-+ns1.dnssec-parent.com:1.2.3.4:3600
-+ns2.dnssec-parent.com:4.3.2.1:3600
-:secure-delegated.dnssec-parent.com:43:\324\057\010\002\240\271\303\214\323\044\030\052\360\357f\203\015\012\016\205\241\325\211y\311\203N\030\310qw\236\004\010W\267:3600
 &secure-delegated.dnssec-parent.com::ns1.secure-delegated.dnssec-parent.com.:3600
 &secure-delegated.dnssec-parent.com::ns2.secure-delegated.dnssec-parent.com.:3600
++dnssec-parent.com:9.9.9.9:3600
++ns1.delegated.dnssec-parent.com:4.5.6.7:3600
++ns1.dnssec-parent.com:1.2.3.4:3600
 +ns1.secure-delegated.dnssec-parent.com:1.2.3.4:3600
++ns2.delegated.dnssec-parent.com:5.6.7.8:3600
++ns2.dnssec-parent.com:4.3.2.1:3600
 +ns2.secure-delegated.dnssec-parent.com:5.6.7.8:3600
++something1.auth-ent.dnssec-parent.com:1.1.2.3:3600
+:secure-delegated.dnssec-parent.com:43:\324\057\010\002\240\271\303\214\323\044\030\052\360\357f\203\015\012\016\205\241\325\211y\311\203N\030\310qw\236\004\010W\267:3600
+Zdnssec-parent.com:ns1.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2005092501 auto axfr-get
-Zdelegated.dnssec-parent.com:ns1.delegated.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600
 &delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600
 +delegated.dnssec-parent.com:9.9.9.9:3600
-:delegated.dnssec-parent.com:43:\253\376\010\002\324\303\325U\053\206y\372\356\2741\176\137\004\213aK.\137\140\175\305\177\025S\030-I\253\041y\367:3600
 +ns1.delegated.dnssec-parent.com:4.5.6.7:3600
 +ns2.delegated.dnssec-parent.com:5.6.7.8:3600
+:delegated.dnssec-parent.com:43:\253\376\010\002\324\303\325U\053\206y\372\356\2741\176\137\004\213aK.\137\140\175\305\177\025S\030-I\253\041y\367:3600
 Cwww.delegated.dnssec-parent.com:delegated.dnssec-parent.com.:3600
+Zdelegated.dnssec-parent.com:ns1.delegated.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2005092501 auto axfr-get
-Zsecure-delegated.dnssec-parent.com:ns1.secure-delegated.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &secure-delegated.dnssec-parent.com::ns1.secure-delegated.dnssec-parent.com.:3600
 &secure-delegated.dnssec-parent.com::ns2.secure-delegated.dnssec-parent.com.:3600
-+secure-delegated.dnssec-parent.com:9.9.9.9:3600
 +ns1.secure-delegated.dnssec-parent.com:1.2.3.4:3600
 +ns2.secure-delegated.dnssec-parent.com:5.6.7.8:3600
++secure-delegated.dnssec-parent.com:9.9.9.9:3600
 Cwww.secure-delegated.dnssec-parent.com:secure-delegated.dnssec-parent.com.:3600
+Zsecure-delegated.dnssec-parent.com:ns1.secure-delegated.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 #2000081501 auto axfr-get
-Zminimal.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 &minimal.com::ns1.example.com.:120
 &minimal.com::ns2.example.com.:120
+Zminimal.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 #2000081501 auto axfr-get
-Ztsig.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 &tsig.com::ns1.example.com.:120
 &tsig.com::ns2.example.com.:120
+Ztsig.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 #2000081501 auto axfr-get
-Zstest.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 &stest.com::ns1.example.com.:120
 &stest.com::ns2.example.com.:120
+Zstest.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120
 #2005092501 auto axfr-get
-Zcdnskey-cds-test.com:ns1.cdnskey-cds-test.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &cdnskey-cds-test.com::ns1.cdnskey-cds-test.com.:3600
 &cdnskey-cds-test.com::ns2.cdnskey-cds-test.com.:3600
 +cdnskey-cds-test.com:127.0.0.1:3600
 +ns1.cdnskey-cds-test.com:1.1.1.1:3600
 +ns2.cdnskey-cds-test.com:2.2.2.2:3600
+Zcdnskey-cds-test.com:ns1.cdnskey-cds-test.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600

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

diff --git a/modules/tinydnsbackend/generate-data.sh b/modules/tinydnsbackend/generate-data.sh
index ea1925fa2036706847fdb8cd6b84576148fb0502..250d85bb1f5fcd9181351406bee062971bab2a6a 100755 (executable)
--- a/modules/tinydnsbackend/generate-data.sh
+++ b/modules/tinydnsbackend/generate-data.sh
@@ -34,7 +34,7 @@ cd $startdir
 for zone in $(grep 'zone ' ../../regression-tests/named.conf | cut -f2 -d\")
 do
   $TCPCLIENT 127.0.0.1 5300 $AXFRGET $zone $zone.out $zone.out.tmp
-  cat $zone.out >> data
+  LC_ALL=C sort $zone.out >> data
   rm $zone.out
 done
 

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index 00548c704970c2083c50b0d7fec0264258f0fd84..c8975056f2a1db701f1bf8ae920fd7fec03e98ba 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -10,4 +10,4 @@ a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/zones/secure-delegated.dns
 0b20d7a0250576451135483b863750bf  ../regression-tests/zones/tsig.com
 b1f775045fa2cf0a3b91aa834af06e49  ../regression-tests/zones/stest.com
 a98864b315f16bcf49ce577426063c42  ../regression-tests/zones/cdnskey-cds-test.com
-ce8464687f59b932745eb8adbf810c9f  ../modules/tinydnsbackend/data.cdb
+76045422953b930088760df7aec37385  ../modules/tinydnsbackend/data.cdb