X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=9046db6985cf15e25f1707a898ce3dc993452fb2;hb=701528fc8153f150dae52787cca172d8ab4f4bfb;hp=4e3b39dff3e3925b4f13b63072deb1109d698004;hpb=b646eaa10995f71469f5fb18c432d13bf3f884ac;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 4e3b39d..9046db6 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -178,7 +178,8 @@ def DoSSH(Str,Attrs):
 def DoDNS(Str,Attrs,DnRecord):
    if re.match('^[\w-]+\s+in\s+a\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$',\
         Str,re.IGNORECASE) == None and \
-      re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
+      re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None and \
+      re.match("^[\w-]+\s+in\s+mx\s+\d{1,3}\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
      return None;     
 
    # Check if the name is already taken
@@ -203,7 +204,7 @@ def DoDNS(Str,Attrs,DnRecord):
 # Handle an [almost] arbitary change
 def HandleChange(Reply,DnRecord,Key):
    global PlainText;
-   Lines = string.split(PlainText,"\r\n");
+   Lines = re.split("\n *\r?",PlainText);
 
    Result = "";
    Attrs = [];