X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=cd6b5177c513ea2b9093ebc6eeea5b3df62f2eea;hb=afe66549b3d3bbebeccf573a1d61f01c61e176d2;hp=02693b615a57c22829c58ae3954ee315897d3e9a;hpb=2d0e9a95ddac429690ce07cedfb23a1cfb2c8293;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 02693b6..cd6b517 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -192,11 +192,10 @@ def DoArbChange(Str, Attrs): if attrName not in ArbChanges: return None - if re.match(ArbChanges[attrName], G[1]) is None: + value = G[1] + if re.match(ArbChanges[attrName], value) is None: raise UDFormatError("Item does not match the required format" + ArbChanges[attrName]) - value = G[1]; - Attrs.append((ldap.MOD_REPLACE, attrName, value)) return "Changed entry %s to %s" % (attrName, value) @@ -434,7 +433,7 @@ def DoDNS(Str, Attrs, DnRecord): if p == "": if seenEmptypart: return "Invalid IPv6 address (%s): more than one :: (nothing in between colons) is not allowed" % (ipv6address) - seenEmptypart = True + seenEmptypart = True sanitized = "%s IN AAAA %s" % (hostname, ipv6address) else: raise UDFormatError("None of the types I recognize was it. I shouldn't be here. confused.")