no fancy-records in tinydns generate-data.sh

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 26098dbd2541c59ebd4d463a29c0e8e9369b2e61..0d053c237b6035ba09ca01daf20701f2af91c43a 100644 (file)
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20017,7 +20017,7 @@ Cexternal.example.com:somewhere.else.net.: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
-3ipv6.example.com:200106a80000000102104bfffe4b4c61: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
 +italy-ns1.example.com:192.168.5.1:120
@@ -20145,7 +20145,7 @@ Cwww.example.com:outpost.example.com.:120
 Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 &test.com::ns1.test.com.:3600
 &test.com::ns2.test.com.:3600
-@test.com::smtp-servers.example.com.:10: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
@@ -20169,6 +20169,7 @@ Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400: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
 :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
@@ -20199,8 +20200,8 @@ Ccname2.test.dyndns:host-2.test.dyndns.:3600
 #2005092501 auto axfr-get
 Zwtest.com:ns1.wtest.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 +wtest.com:9.9.9.9:3600
+&wtest.com::..:3600
 &wtest.com::ns1.wtest.com.:3600
-&wtest.com::ns2.wtest.com.: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
@@ -20211,7 +20212,6 @@ C\052.wtest.com:server1.wtest.com.: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
 +ns1.wtest.com:2.3.4.5:3600
-+ns2.wtest.com:5.6.7.8:3600
 @secure.wtest.com::server1.wtest.com.:10:3600
 +server1.wtest.com:1.2.3.4:3600
 :something.wtest.com:16:\045make\040the\040empty\040non-terminal\040non-empty:3600

diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index 8f8658c923f8c8974058972bbfdbf55f81afad75..a558791d432b91537cbfbd42967217e747eeca39 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 e547071fa89c9f62d500ca11474fbb12479f94f2..3a42061ba1d4e09e29c4b282837bb735571cdd70 100755 (executable)
--- a/modules/tinydnsbackend/generate-data.sh
+++ b/modules/tinydnsbackend/generate-data.sh
@@ -31,7 +31,7 @@ done
 cd ../../regression-tests
 ../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ \
        --no-shuffle --launch=bind --bind-config=../regression-tests/named.conf \
-       --fancy-records --query-logging --send-root-referral --loglevel=0 \
+       --query-logging --send-root-referral --loglevel=0 \
        --cache-ttl=0 --no-config --local-address=127.0.0.1 \
        --bind-ignore-broken-records=yes &
 

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index e71c4cfb12ef06288f9263a1fc8ed1233571b2f4..d2147509b984f181dea921fc0caa801c0d1031e8 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -9,4 +9,4 @@ a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/zones/secure-delegated.dns
 24514dc104b22206daeb973ff9303545  ../regression-tests/zones/minimal.com
 0b20d7a0250576451135483b863750bf  ../regression-tests/zones/tsig.com
 b1f775045fa2cf0a3b91aa834af06e49  ../regression-tests/zones/stest.com
-11085cc884e2db8bbd5a4710aad23604  ../modules/tinydnsbackend/data.cdb
+1229888ae5dc9b1ec5ea9072434ac52a  ../modules/tinydnsbackend/data.cdb

diff --git a/regression-tests/tests/nsec-wildcard/expected_result.nsec3 b/regression-tests/tests/nsec-wildcard/expected_result.nsec3
index 0eab68eae600ae708f6afa0a1440e5f3f4a13770..3f31a6341a515aa9db5fd65d4b2e4286d9de928e 100644 (file)
--- a/regression-tests/tests/nsec-wildcard/expected_result.nsec3
+++ b/regression-tests/tests/nsec-wildcard/expected_result.nsec3
@@ -1,4 +1,4 @@
-1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     IN      NSEC3   86400   1 [flags] 1 abcd 44PRS96U2Q7MTAV4DNQMOSMSSI0K7630 A RRSIG
+1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     IN      NSEC3   86400   1 [flags] 1 abcd 53I5J7TGM8QG2GBV716RVQVARQCIJUE2 A RRSIG
 1      2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ...
 1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      NSEC3   86400   1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G TXT RRSIG
 1      54njs65s8u96tkffrft6l7j1t1556vik.wtest.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ...

diff --git a/regression-tests/tests/underscore-sorting/expected_result.nsec3 b/regression-tests/tests/underscore-sorting/expected_result.nsec3
index 27092d57f7a655513b9b08da0705a0f553108d00..1dcbe75ef3b0c1110121a94df2b3c524d888b51f 100644 (file)
--- a/regression-tests/tests/underscore-sorting/expected_result.nsec3
+++ b/regression-tests/tests/underscore-sorting/expected_result.nsec3
@@ -1,2 +1,2 @@
 1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.      IN      NSEC3   86400   1 [flags] 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
-1      igf4m7otecach14p0a6ingi7dbuas5b2.test.com.      IN      NSEC3   86400   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.test.com.      IN      NSEC3   86400   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG

diff --git a/regression-tests/tests/uppercase-nsec/expected_result.nsec3 b/regression-tests/tests/uppercase-nsec/expected_result.nsec3
index cfacf4041286fa5e4b19cdcd9fa78be03889385d..53e0b00867f7d1581bd3250dd3c48398ffc7602f 100644 (file)
--- a/regression-tests/tests/uppercase-nsec/expected_result.nsec3
+++ b/regression-tests/tests/uppercase-nsec/expected_result.nsec3
@@ -2,8 +2,8 @@
 1      2eu2gulbu53h9uvhfalshpbo2a83t6l2.Test.com.      IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.com. ...
 1      Test.com.       IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.com. ...
 1      Test.com.       IN      SOA     3600    ns1.Test.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      igf4m7otecach14p0a6ingi7dbuas5b2.Test.com.      IN      NSEC3   86400   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG
-1      igf4m7otecach14p0a6ingi7dbuas5b2.Test.com.      IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.com. ...
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      IN      NSEC3   86400   1 [flags] 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
+1      n5rskfsbg0uk5sspj595r6546hkk5vk1.Test.com.      IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.com. ...
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='z.Test.com.', qtype=A