From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 16 Aug 2013 05:38:54 +0000 (+0200)
Subject: Revert "refuse control characters in TXT, except for \n and \t"
X-Git-Tag: rec-3.6.0-rc1~516
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=973efd35b94d227a6ff9d2ffd8126734707110dd;p=thirdparty%2Fpdns.git

Revert "refuse control characters in TXT, except for \n and \t"

This reverts commit aef73302b5bf7942f9ec44313991986a62153be8.

This should fix lookup of dnscrypt TXT records in the recursor.
---

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