From: rmurray <>
Date: Thu, 28 Dec 2006 21:09:15 +0000 (+0000)
Subject: fix domain name regex to allow - and not allow _
X-Git-Tag: userdir-ldap-0.3.13~4
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=5288a721e3a838f78746bd63c4416636fdd44825

fix domain name regex to allow - and not allow _
---

diff --git a/ud-mailgate b/ud-mailgate
index eb48d60..9907222 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -251,7 +251,7 @@ def DoDNS(Str,Attrs,DnRecord):
 
 # Handle an RBL list (mailRBL, mailRHSBL, mailWhitelist)
 def DoRBL(Str,Attrs):
-   Match = re.compile('^mail(rbl|rhsbl|whitelist) ([\w.]+)$').match(string.lower(Str))
+   Match = re.compile('^mail(rbl|rhsbl|whitelist) ([-a-z0-9.]+)$').match(string.lower(Str))
    if Match == None:
       return None