From: Michael Stapelberg <stapelberg@debian.org>
Date: Fri, 18 Aug 2017 06:22:17 +0000 (+0200)
Subject: ud-mailgate: allow : in TXT record contents
X-Git-Tag: userdir-ldap-0.3.93~30
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=fadea738b61fb92cef4310c940aafdb32f989002

ud-mailgate: allow : in TXT record contents

Some systems require : in TXT records, e.g. upspin:
https://upspin.io/doc/server_setup.md
---

diff --git a/ud-mailgate b/ud-mailgate
index b23e8a5..e6b54a9 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -372,7 +372,7 @@ def DoDNS(Str,Attrs,DnRecord):
    cnamerecord = re.match("^[-\w]+\s+IN\s+CNAME\s+([-\w.]+\.)$",Str,re.IGNORECASE)
    arecord     = re.match('^[-\w]+\s+IN\s+A\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$',Str,re.IGNORECASE)
    mxrecord    = re.match("^[-\w]+\s+IN\s+MX\s+(\d{1,3})\s+([-\w.]+\.)$",Str,re.IGNORECASE)
-   txtrecord   = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@]+)", Str, re.IGNORECASE)
+   txtrecord   = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@:]+)", Str, re.IGNORECASE)
    #aaaarecord  = re.match('^[-\w]+\s+IN\s+AAAA\s+((?:[0-9a-f]{1,4})(?::[0-9a-f]{1,4})*(?::(?:(?::[0-9a-f]{1,4})*|:))?)$',Str,re.IGNORECASE)
    aaaarecord  = re.match('^[-\w]+\s+IN\s+AAAA\s+([A-F0-9:]{2,39})$',Str,re.IGNORECASE)