Add a flags "s" NAPTR test to exercize previous commit.

Author: miodvallat

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

modules/tinydnsbackend/data.cdb

@@ -1,5 +1,5 @@
 f3e86fd522b08d4812505da489ecb5b0  ../regression-tests/zones/example.com
-f8f0d7b157495ec8ee70851e3d5cb65e  ../regression-tests/zones/test.com
+e9c9c88556f46e3e5421b8c163f124ca  ../regression-tests/zones/test.com
 e5e3ee998d151fe194b98997eaa36c53  ../regression-tests/zones/test.dyndns
 dee3e8b568549d9450134b555ca73990  ../regression-tests/zones/sub.test.dyndns
 e7c0fd528e8aaedb1ea3b6daaead4de2  ../regression-tests/zones/wtest.com
@@ -15,5 +15,5 @@ a98864b315f16bcf49ce577426063c42  ../regression-tests/zones/cdnskey-cds-test.com
 9aeed2c26d0c3ba3baf22dfa9568c451  ../regression-tests/zones/2.0.192.in-addr.arpa
 99c73e8b5db5781fec1ac3fa6a2662a9  ../regression-tests/zones/cryptokeys.org
 1f9e19be0cff67330f3a0a5347654f91  ../regression-tests/zones/hiddencryptokeys.org
-16ca9f82f476f5910ed89830dc0f183b  ../modules/tinydnsbackend/data
-022f54332046eb386d636bd9141a4e77  ../modules/tinydnsbackend/data.cdb
+ed22ff3115b4144ded66d170bf68f69c  ../modules/tinydnsbackend/data
+712c915785987f422236e71a381f3df4  ../modules/tinydnsbackend/data.cdb

regression-tests.nobackend/tinydns-data-check/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

regression-tests/tests/ent-axfr/expected_result

@@ -1,3 +1,3 @@
 #!/bin/sh
 cleandig enum.test.com NAPTR
-
+cleandig ensm.test.com NAPTR

regression-tests/tests/naptr/command

@@ -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

regression-tests/tests/naptr/expected_result

@@ -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