From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 6 Apr 2019 21:24:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'jrtc27/master'
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=f60516f70fc0e00488de904c44b86428706f39f4;hp=2d0e9a95ddac429690ce07cedfb23a1cfb2c8293

Merge remote-tracking branch 'jrtc27/master'

* jrtc27/master:
  ud-mailgate: Assign value before check and drop semicolon
---

diff --git a/ud-mailgate b/ud-mailgate
index 02693b6..32985d1 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)