- Changelog entry for:

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

diff --git a/doc/Changelog b/doc/Changelog
index aaf71f23971618f6ff7d4f34be4d12af2ba7f67d..b8b2ddd524e2009748396ae814598fb9b3c8b71e 100644 (file)
--- a/doc/Changelog
+++ b/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

diff --git a/testdata/ipset.tdir/ipset.conf b/testdata/ipset.tdir/ipset.conf
index 7cc34912dd2f02e9012dc50b0832095e6f5095a8..3a5eb7b644dd229086d29a6e0f26f826a58aab01 100644 (file)
--- a/testdata/ipset.tdir/ipset.conf
+++ b/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

diff --git a/testdata/ipset.tdir/ipset.test b/testdata/ipset.tdir/ipset.test
index 4dab457bab908fd5b9bbb4795d2d664cde57f052..bfe17b6e6776549e8478b54ac65acca13bfbc02c 100644 (file)
--- a/testdata/ipset.tdir/ipset.test
+++ b/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

diff --git a/testdata/ipset.tdir/ipset.testns b/testdata/ipset.tdir/ipset.testns
index 2b626e915ea7b17d0e40694c3b7942bf2453f1f5..f67d77ed6928bdc8d75905abf4f182d207b07432 100644 (file)
--- a/testdata/ipset.tdir/ipset.testns
+++ b/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