From 1a75a5cee6a8c0157cb9ed86361ba4b3f179bdd1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 11 Apr 2019 18:54:24 +1000 Subject: [PATCH] Process master file comments and make input invalid again --- lib/dns/tests/dnstest.c | 5 +++++ lib/dns/tests/rdata_test.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index dcaed95745..5510945272 100644 --- 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 11b31e8ace..83c475c5a8 100644 --- 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"),