Process master file comments and make input invalid again

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index dcaed957451e084685e2794c6e875374937648e9..551094527212d9d0413419dce27a5f6a4ec2b360 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -516,6 +516,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 11b31e8ace0be8aaf4050f892e2a5ea62bfdceaf..83c475c5a82617ace7ba79647412e86185a1453b 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -1893,8 +1893,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"),