fix up records with embedded newlines in content field, closing ticket 395

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2394 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnslabeltext.rl b/pdns/dnslabeltext.rl
index 1d3bda25942e96a821fa1d33054c257d2e337520..677167cbbc0c828807d0da0f36ee627b74923f97 100644 (file)
--- a/pdns/dnslabeltext.rl
+++ b/pdns/dnslabeltext.rl
@@ -62,7 +62,7 @@ vector<string> segmentDNSText(const string& input )
                 }
 
                 escaped = '\\' ((["\\]@reportEscaped) | ([0-9]{3}$reportEscapedNumber%doneEscapedNumber));
-                plain = (print-'\\'-'"') $ reportPlain;
+                plain = ((print-'\\'-'"')|'\n') $ reportPlain;
                 txtElement = escaped | plain;
             
                 main := (('"' txtElement* '"' space?) >segmentBegin %segmentEnd)+;