summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@isc.org>2013-03-07 05:42:40 +0100
committerMukund Sivaraman <muks@isc.org>2013-03-07 05:42:40 +0100
commit00d53a32412c50c20c573f40d895e8ad7f74ad4f (patch)
tree611b027651922c679988f77ec301ac48c45e83ae
parent[2387] Allow whitespace in the DNSKEY public key (diff)
downloadkea-00d53a32412c50c20c573f40d895e8ad7f74ad4f.tar.xz
kea-00d53a32412c50c20c573f40d895e8ad7f74ad4f.zip
[2387] Allow comments at the end of DS like string data
-rw-r--r--src/lib/dns/rdata/generic/detail/ds_like.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/dns/rdata/generic/detail/ds_like.h b/src/lib/dns/rdata/generic/detail/ds_like.h
index a7bebbfa46..4f742b9c9d 100644
--- a/src/lib/dns/rdata/generic/detail/ds_like.h
+++ b/src/lib/dns/rdata/generic/detail/ds_like.h
@@ -79,7 +79,14 @@ public:
constructFromLexer(lexer);
- if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
+ for (MasterToken::Type token_type = lexer.getNextToken().getType();
+ token_type != MasterToken::END_OF_FILE;
+ token_type = lexer.getNextToken().getType())
+ {
+ if (token_type == MasterToken::END_OF_LINE) {
+ continue;
+ }
+
isc_throw(InvalidRdataText,
"Extra input text for " << RRType(typeCode) << ": "
<< ds_str);