add test.dyndns zone to tinydns data file

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index cbcbd13f34b92498ac1741a532918e5d27e506de..c4a649f2eedb5d6f192007694c4c333af9addf72 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
@@ -20047,6 +20047,7 @@ 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
@@ -20169,6 +20170,30 @@ C\052.test.test.com:server1.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
+#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
++a.host.test.dyndns:1.1.1.1: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
++host-3.test.dyndns:127.0.0.103:3600
++multi.test.dyndns:127.0.0.1:3600
++multi.test.dyndns:127.0.0.2:3600
++multi.test.dyndns:127.0.0.3:3600
++ns1.test.dyndns:127.0.0.1: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
+:txt.test.dyndns:16:\021This\040is\040some\040text:3600
++\052.wild.test.dyndns:127.0.1.255: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

diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index c44ab853a4d209a4978a392e6e2331c79b25741a..5e8a046ebd001047093d59f041b888425c181ac1 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 cdcea72444d772386941dd48b3b72613e9e05b73..74310c53232cf12978cf4e3d4e3528cdce2edfae 100755 (executable)
--- a/modules/tinydnsbackend/generate-data.sh
+++ b/modules/tinydnsbackend/generate-data.sh
@@ -17,6 +17,16 @@ then
 fi
 
 
+# Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well)
+for zone in $(grep zone ../../regression-tests/named.conf | cut -f2 -d\")
+do
+       if [ -f ../../regression-tests/$zone.orig ]
+       then
+               cp -f ../../regression-tests/$zone.orig ../../regression-tests/$zone
+       fi
+done
+
+
 # CD to regression testt because named.conf has relative paths.
 cd ../../regression-tests
 ../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ \
@@ -31,7 +41,7 @@ sleep 5
 cd $startdir
 [ -e data ] && rm data
 
-for zone in `cat ../../regression-tests/named.conf | grep zone | cut -f 2 -d \"`
+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

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index 0c338c0f5e8ede5ea264c23bd911bf7d6db6ab90..3f5b50fdf9fcf525d688ea000ec7beb4fea8dd38 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,4 +1,4 @@
-f1eebfc1577c3dcf26b4390fbc7bb0b2  ../regression-tests/example.com
+4bc48a8d9b8d04b553be67639e5656e8  ../regression-tests/example.com
 a2dd754820cb88fdd3d80b54a212a270  ../regression-tests/test.com
 005b3381db2a7dc70b690484f6ab7770  ../regression-tests/test.dyndns
 21213b4e8cd56e4184696a1bafd987d7  ../regression-tests/wtest.com
@@ -6,4 +6,4 @@ a2dd754820cb88fdd3d80b54a212a270  ../regression-tests/test.com
 42dd3a56c7d268e75836371878819ec4  ../regression-tests/delegated.dnssec-parent.com
 a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/secure-delegated.dnssec-parent.com
 24514dc104b22206daeb973ff9303545  ../regression-tests/minimal.com
-b62dc3974faf53b7f5ffbaa70788fcfe  ../modules/tinydnsbackend/data.cdb
+f77817aafda5cd6a8e3d4ac998be6fff  ../modules/tinydnsbackend/data.cdb

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 72b1eb54def9522bd2b2b877561691b39eacd22e..08b275a73afcb75563eb3af17fa68807bcf4d9a6 100644 (file)
--- a/regression-tests/.gitignore
+++ b/regression-tests/.gitignore
@@ -9,7 +9,6 @@ real_result
 /trustedkeys
 /test-results
 /*.pid
-/*.backup
 /passed_tests
 /failed_tests*
 /powerdns.sqlite3

diff --git a/regression-tests/example.com b/regression-tests/example.com
index 3ab717b283460cb635698535eebee58af1b52035..4e18d384905bd5185b6411afcb3f8fd75b2e381f 100644 (file)
--- a/regression-tests/example.com
+++ b/regression-tests/example.com
@@ -93,7 +93,8 @@ text0                 IN      TXT     "k=rsa; p=one"
 text1                  IN      TXT     "k=rsa\; p=one"
 text2                  IN      TXT     "k=rsa\\; p=one"
 text3                  IN      TXT     "k=rsa\\\; p=one"
-
+;
+host.*.sub             IN      A       192.168.6.1
 ;
 ipv6                   IN      AAAA    2001:6A8:0:1:210:4BFF:FE4B:4C61
 ;