- Changelog entry for:

Merge #955 from buevsan: fix ipset wrong behavior.
- Update testdata/ipset.tdir test for ipset fix.

doc/Changelog

@@ -4,6 +4,8 @@
 	  refactoring for better readability.
 	- Fixes for the DNS64 patches.
 	- Update the dns64_lookup.rpl test for the DNS64 fallback patch.
+	- Merge #955 from buevsan: fix ipset wrong behavior.
+	- Update testdata/ipset.tdir test for ipset fix.
 
 17 October 2023: Wouter
 	- Fix #954: Inconsistent RPZ handling for A record returned along with

testdata/ipset.tdir/ipset.conf

@@ -18,6 +18,9 @@ stub-zone:
 stub-zone:
 	name: "example.com."
 	stub-addr: "127.0.0.1@@TOPORT@"
+stub-zone:
+	name: "lookslikeexample.net."
+	stub-addr: "127.0.0.1@@TOPORT@"
 ipset:
 	name-v4: atotallymadeupnamefor4
 	name-v6: atotallymadeupnamefor6

testdata/ipset.tdir/ipset.test

@@ -146,6 +146,29 @@ else
 	exit 1
 fi
 
+echo "> dig lookslikeexample.net. AAAA"
+dig @127.0.0.1 -p $UNBOUND_PORT lookslikeexample.net. AAAA | tee outfile
+echo "> check answer"
+if grep "::4" outfile; then
+	echo "OK"
+else
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+echo "> check ipset"
+if grep "ipset: add ::4 to atotallymadeupnamefor6 for lookslikeexample.net." unbound.log; then
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+else
+	echo "ipset OK"
+fi
+
 echo "> cat logfiles"
 cat tap.log
 cat tap.errlog

testdata/ipset.tdir/ipset.testns

@@ -101,3 +101,13 @@ target.example.com.	IN	AAAA
 SECTION ANSWER
 target.example.com.	IN	AAAA	::3
 ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+lookslikeexample.net.	IN	AAAA
+SECTION ANSWER
+lookslikeexample.net.	IN	AAAA	::4
+ENTRY_END