Process master file comments and make input invalid again

(cherry picked from commit 1a75a5cee6a8c0157cb9ed86361ba4b3f179bdd1)

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index e0f668fef1667f98f8a92a6e18a6dbb923de57b8..4f49b30709ec6f61ffa01a2e93d565596c169a5b 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -545,6 +545,11 @@ dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
        specials['"'] = 1;
        isc_lex_setspecials(lex, specials);
 
+       /*
+        * Expect DNS masterfile comments.
+        */
+       isc_lex_setcomments(lex, ISC_LEXCOMMENT_DNSMASTERFILE);
+
        /*
         * Point lexer at source.
         */

diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index b7b66f3d37011c29ec970ea573b84afd52c69292..0dd7042986158c75101c1eadbfa4b6f49ff855c9 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -1941,8 +1941,8 @@ nsec3(void **state) {
                TEXT_INVALID("."),
                TEXT_INVALID(". RRSIG"),
                TEXT_INVALID("1 0 10 76931F"),
-               TEXT_INVALID("1 0 10 76931F IMQ912BREQP1POLAH3RMONG;UED541AS"),
-               TEXT_INVALID("1 0 10 76931F IMQ912BREQP1POLAH3RMONG;UED541AS A RRSIG"),
+               TEXT_INVALID("1 0 10 76931F IMQ912BREQP1POLAH3RMONG&UED541AS"),
+               TEXT_INVALID("1 0 10 76931F IMQ912BREQP1POLAH3RMONGAUED541AS A RRSIG BADTYPE"),
                TEXT_VALID("1 0 10 76931F AJHVGTICN6K0VDA53GCHFMT219SRRQLM A RRSIG"),
                TEXT_VALID("1 0 10 76931F AJHVGTICN6K0VDA53GCHFMT219SRRQLM"),
                TEXT_VALID("1 0 10 - AJHVGTICN6K0VDA53GCHFMT219SRRQLM"),