Permalink
Browse files

strip all types of whitespace from around content while parsing zones…

…, fixes #3568
  • Loading branch information...
1 parent 03281d9 commit e9e413f99190df7464de0f7717937c2804a67026 @Habbie Habbie committed with mind04 Mar 14, 2016
@@ -387,6 +387,7 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
}
}
}
+ trim_if(rr.content, is_any_of(" \r\n\x1a"));
vector<string> recparts;
switch(rr.qtype.getCode()) {
@@ -1,4 +1,4 @@
-4bc48a8d9b8d04b553be67639e5656e8 ../regression-tests/zones/example.com
+59fa5fcee80e729f764d3cf889b7288e ../regression-tests/zones/example.com
c5d5a2a68d72760b5f6f563eb0a1b6d5 ../regression-tests/zones/test.com
005b3381db2a7dc70b690484f6ab7770 ../regression-tests/zones/test.dyndns
0861783f9f83acd9044278cda2528ee2 ../regression-tests/zones/wtest.com
@@ -86,7 +86,9 @@ smtp1 IN CNAME outpost
;
external-mail IN MX 25 server1.test.com.
;
-text IN TXT "Hi, this is some text"
+text IN TXT (
+ "Hi, this is some text"
+ )
multitext IN TXT "text part one" "text part two" "text part three"
escapedtext IN TXT "begin" "the \"middle\" p\\art" "the end"
text0 IN TXT "k=rsa; p=one"

0 comments on commit e9e413f

Please sign in to comment.